Merge from origin/emacs-25

[gnu-emacs] / nt / inc / pwd.h

diff --git a/nt/inc/pwd.h b/nt/inc/pwd.h
index 31c0df7ec30226dfad8147d5f95510455a39bb90..54e477e966581383a523f76e24c4718d47658278 100644 (file)
--- a/nt/inc/pwd.h
+++ b/nt/inc/pwd.h
@@ -5,24 +5,25 @@
  */
 
 struct passwd {
-    char *pw_name;
-    char *pw_passwd;
-    int   pw_uid;
-    int   pw_gid;
-    int   pw_quota;
-    char *pw_gecos;
-    char *pw_dir;
-    char *pw_shell;
+    char     *pw_name;
+    char     *pw_passwd;
+    unsigned  pw_uid;  /* Vista's TrustedInstaller has a very large RID */
+    unsigned  pw_gid;
+    int       pw_quota;
+    char     *pw_gecos;
+    char     *pw_dir;
+    char     *pw_shell;
 };
 
-typedef int uid_t;
+typedef unsigned uid_t;
 typedef uid_t gid_t;
 
-struct passwd * getpwnam (char *);
-struct passwd * getpwuid (int);
+extern unsigned getuid (void);
+extern unsigned geteuid (void);
+
+extern struct passwd * getpwnam (char *);
+extern struct passwd * getpwuid (unsigned);
 
 
 #endif /* _PWD_H_ */
 
-/* arch-tag: 68308424-cb2b-49ed-bb52-b347fee416bf
-   (do not change this comment) */