X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0de40240bbe5d1edc85bdf32e5c014be88a3a14a..3174b31d96adf0dad334e187ad6442acc6b75a62:/rsync.h

diff --git a/rsync.h b/rsync.h
index b53fa3de..9f231199 100644
--- a/rsync.h
+++ b/rsync.h
@@ -387,7 +387,6 @@ static inline int flist_up(struct file_list *flist, int i)
 }
 
 #include "byteorder.h"
-#include "version.h"
 #include "proto.h"
 #include "lib/mdfour.h"
 
@@ -401,11 +400,11 @@ int asprintf(char **ptr, const char *format, ...);
 int vasprintf(char **ptr, const char *format, va_list ap);
 #endif
 
-#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#if !defined(HAVE_VSNPRINTF) && !defined(HAVE_C99_VSNPRINTF)
 int vsnprintf (char *str, size_t count, const char *fmt, va_list args);
 #endif
 
-#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#if !defined(HAVE_SNPRINTF) && !defined(HAVE_C99_VSNPRINTF)
 int snprintf(char *str,size_t count,const char *fmt,...);
 #endif
 
@@ -563,3 +562,8 @@ size_t strlcat(char *d, const char *s, size_t bufsize);
 
 
 extern int verbose;
+
+extern struct global_opts {
+	/** Network address family. **/
+	int af_hint;
+} global_opts;