It seems that some popt releases don't define POPT_TABLEEND, so don't

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 79bd0ae..fb6b78c 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -90,8 +90,7 @@
 #define SPARSE_WRITE_SIZE (1024)
 #define WRITE_SIZE (32*1024)
 #define CHUNK_SIZE (32*1024)
-#define MAX_MAP_SIZE (512*1024)
-#define MAX_BLOCK_SIZE (256*1024)
+#define MAX_MAP_SIZE (256*1024)
 #define IO_BUFFER_SIZE (4092)
 
 #define IOERR_GENERAL  (1<<0) /* For backward compatibility, this must == 1 */
@@ -109,6 +108,7 @@
 #define XFLG_DEF_INCLUDE       (1<<1)
 #define XFLG_WORDS_ONLY        (1<<2)
 #define XFLG_WORD_SPLIT        (1<<3)
+#define XFLG_DIRECTORY         (1<<4)
 
 #define PERMS_REPORT           (1<<0)
 #define PERMS_SKIP_MTIME       (1<<1)
@@ -255,6 +255,9 @@ enum msgcode {
 
 #if MAJOR_IN_MKDEV
 #include <sys/mkdev.h>
+# if !defined(makedev) && defined(mkdev)
+#  define makedev mkdev
+# endif
 #elif MAJOR_IN_SYSMACROS
 #include <sys/sysmacros.h>
 #endif