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

diff --git a/rsync.h b/rsync.h
index b53fa3de..f723b34c 100644
--- a/rsync.h
+++ b/rsync.h
@@ -387,10 +387,10 @@ static inline int flist_up(struct file_list *flist, int i)
 }
 
 #include "byteorder.h"
-#include "version.h"
 #include "proto.h"
 #include "lib/mdfour.h"
-
+#include "lib/permstring.h"
+#include "lib/addrinfo.h"
 
 /* We have replacement versions of these if they're missing. */
 #ifndef HAVE_ASPRINTF
@@ -401,11 +401,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 +563,23 @@ size_t strlcat(char *d, const char *s, size_t bufsize);
 
 
 extern int verbose;
+
+extern struct global_opts {
+	/** Network address family. **/
+	int af_hint;
+	
+	/** Do not go into the background when run as --daemon.  Good
+	 * for debugging and required for running as a service on W32,
+	 * or under Unix process-monitors. **/
+	int no_detach;
+} global_opts;
+
+
+#ifndef HAVE_INET_NTOP
+const char *                 
+inet_ntop(int af, const void *src, char *dst, size_t size);
+#endif /* !HAVE_INET_NTOP */
+
+#ifndef HAVE_INET_PTON
+int isc_net_pton(int af, const char *src, void *dst);
+#endif