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
Use MAJOR_IN_MKDEV and MAJOR_IN_SYSMACROS.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
d37243a
..
3824773
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-27,7
+27,7
@@
#define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO"
#define RSYNC_NAME "rsync"
#define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO"
#define RSYNC_NAME "rsync"
-#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
+/* RSYNCD_SYSCONF is now set in config.h */
#define RSYNCD_USERCONF "rsyncd.conf"
#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
#define RSYNCD_USERCONF "rsyncd.conf"
#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
@@
-246,6
+246,12
@@
enum msgcode {
# endif
#endif
# endif
#endif
+#if MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#elif MAJOR_IN_SYSMACROS
+#include <sysmacros.h>
+#endif
+
#ifdef HAVE_COMPAT_H
#include <compat.h>
#endif
#ifdef HAVE_COMPAT_H
#include <compat.h>
#endif
@@
-593,6
+599,10
@@
extern int errno;
#define STDERR_FILENO 2
#endif
#define STDERR_FILENO 2
#endif
+#ifndef S_IRUSR
+#define S_IRUSR 0400
+#endif
+
#ifndef S_IWUSR
#define S_IWUSR 0200
#endif
#ifndef S_IWUSR
#define S_IWUSR 0200
#endif