Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of global_opts struct as suggested by Dave -- too many
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
b53fa3d
..
d7db3cd
100644
(file)
--- 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 "byteorder.h"
-#include "version.h"
#include "proto.h"
#include "lib/mdfour.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
/* 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
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
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
int snprintf(char *str,size_t count,const char *fmt,...);
#endif
@@
-563,3
+563,12
@@
size_t strlcat(char *d, const char *s, size_t bufsize);
extern int verbose;
extern int verbose;
+
+#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