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
handle things more grecefully when one machine supports hard links and
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
eb3c01b
..
5759ef2
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-75,6
+75,10
@@
#include <stdlib.h>
#endif
#include <stdlib.h>
#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@
-142,8
+146,10
@@
#ifdef HAVE_SYS_MODE_H
/* apparently AIX needs this for S_ISLNK */
#ifdef HAVE_SYS_MODE_H
/* apparently AIX needs this for S_ISLNK */
+#ifndef S_ISLNK
#include <sys/mode.h>
#endif
#include <sys/mode.h>
#endif
+#endif
#ifdef HAVE_FNMATCH
#include <fnmatch.h>
#ifdef HAVE_FNMATCH
#include <fnmatch.h>
@@
-157,6
+163,9
@@
#include "lib/getopt.h"
#endif
#include "lib/getopt.h"
#endif
+#ifndef S_IFLNK
+#define S_IFLNK 0120000
+#endif
#ifndef S_ISLNK
#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
#ifndef S_ISLNK
#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
@@
-281,13
+290,9
@@
extern int errno;
#define bzero(buf,n) memset(buf,0,n)
#endif
#define bzero(buf,n) memset(buf,0,n)
#endif
-#define SUPPORT_LINKS
(HAVE_READLINK && defined(S_ISLNK))
+#define SUPPORT_LINKS
HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
#define SUPPORT_HARD_LINKS HAVE_LINK
-#ifndef S_ISLNK
-#define S_ISLNK(x) 0
-#endif
-
#if !SUPPORT_LINKS
#define lstat stat
#endif
#if !SUPPORT_LINKS
#define lstat stat
#endif