Correct sizeof usage and other whitespace.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 1937c7c..61e5f06 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -425,7 +425,7 @@ struct file_struct {
        char *basedir;
        uid_t uid;
        gid_t gid;
-       uchar flags;
+       uchar flags;    /* this item MUST remain last */
 };
 
 #define ARENA_SIZE     (32 * 1024)
@@ -712,6 +712,17 @@ size_t strlcat(char *d, const char *s, size_t bufsize);
 
 #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)
 
+#ifdef HAVE_GETEUID
+#define MY_UID() geteuid()
+#else
+#define MY_UID() getuid()
+#endif
+
+#ifdef HAVE_GETEGID
+#define MY_GID() getegid()
+#else
+#define MY_GID() getgid()
+#endif
 
 extern int verbose;