X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/df0054ab13b7d045093d1e6ae44f369a45edb851..b2bffbb2ca73c65175d6ceb4303a59ccc38c0307:/rsync.h

diff --git a/rsync.h b/rsync.h
index 1937c7c7..61e5f06b 100644
--- 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;