X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bcacc18bdf1bdac625ef1f178e8e32892544cc30..bc2e93eb8e6562590492e39349b37c38711a05ce:/rsync.h

diff --git a/rsync.h b/rsync.h
index 34eeb575..e5206409 100644
--- a/rsync.h
+++ b/rsync.h
@@ -43,6 +43,8 @@
 #define MIN_PROTOCOL_VERSION 11
 #define MAX_PROTOCOL_VERSION 30
 
+#define RSYNC_PORT 873
+
 #define SPARSE_WRITE_SIZE (1024)
 #define WRITE_SIZE (32*1024)
 #define CHUNK_SIZE (32*1024)
@@ -50,8 +52,8 @@
 
 #define BLOCKING_TIMEOUT 10
 
-#define FERROR stderr
-#define FINFO (am_server?stderr:stdout)
+#define FERROR 1
+#define FINFO 2
 
 #include "config.h"
 
@@ -167,6 +169,8 @@
 #include <pwd.h>
 #include <grp.h>
 
+#include <stdarg.h>
+
 #ifndef S_IFLNK
 #define S_IFLNK  0120000
 #endif
@@ -179,6 +183,12 @@
 #define uchar unsigned char
 #endif
 
+#if HAVE_UNSIGNED_CHAR
+#define schar signed char
+#else
+#define schar char
+#endif
+
 #ifndef int32
 #if (SIZEOF_INT == 4)
 #define int32 int
@@ -284,6 +294,20 @@ static inline int flist_up(struct file_list *flist, int i)
 	return i;
 }
 
+#if HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# define dirent direct
+# if HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
 
 #include "byteorder.h"
 #include "version.h"
@@ -300,21 +324,6 @@ extern char *sys_errlist[];
 # define strrchr                rindex
 #endif
 
-#if HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
-
 #ifndef HAVE_ERRNO_DECL
 extern int errno;
 #endif