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
Some improvements to the file-name cleaning code:
[rsync/rsync.git]
/
lib
/
addrinfo.h
diff --git
a/lib/addrinfo.h
b/lib/addrinfo.h
index
f3899e5
..
ee9f672
100644
(file)
--- a/
lib/addrinfo.h
+++ b/
lib/addrinfo.h
@@
-124,7
+124,6
@@
TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#endif
#ifndef HAVE_STRUCT_ADDRINFO
#endif
#ifndef HAVE_STRUCT_ADDRINFO
-
struct addrinfo
{
int ai_flags;
struct addrinfo
{
int ai_flags;
@@
-136,8
+135,15
@@
struct addrinfo
char *ai_canonname;
struct addrinfo *ai_next;
};
char *ai_canonname;
struct addrinfo *ai_next;
};
-#endif /* HAVE_STRUCT_ADDRINFO */
+#endif /*
!
HAVE_STRUCT_ADDRINFO */
+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
+struct sockaddr_storage {
+ unsigned short ss_family;
+ unsigned long ss_align;
+ char ss_padding[128 - sizeof (unsigned long)];
+};
+#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
#ifndef HAVE_GETADDRINFO
#ifndef HAVE_GETADDRINFO
@@
-169,6
+175,6
@@
extern const char *gai_strerror(int errcode);
extern int getnameinfo(const struct sockaddr * sa, socklen_t salen,
char *node, size_t nodelen,
char *service, size_t servicelen, int flags);
extern int getnameinfo(const struct sockaddr * sa, socklen_t salen,
char *node, size_t nodelen,
char *service, size_t servicelen, int flags);
-#endif /* HAVE_GETADDRINFO */
+#endif /*
!
HAVE_GETADDRINFO */
#endif /* ADDRINFO_H */
#endif /* ADDRINFO_H */