XEmacs 21.2.29 "Hestia".

[chise/xemacs-chise.git.1] / src / s / mingw32.h

diff --git a/src/s/mingw32.h b/src/s/mingw32.h
index 8168d5a..0e196fe 100644 (file)
--- a/src/s/mingw32.h
+++ b/src/s/mingw32.h
@@ -202,8 +202,8 @@ void sleep (int seconds);
 
 /* subprocess calls that are emulated */
 #define spawnve sys_spawnve
-int spawnve (int mode, CONST char *cmdname, 
-            CONST char * CONST *argv, CONST char *CONST *envp);
+int spawnve (int mode, const char *cmdname, 
+            const char * const *argv, const char *const *envp);
 
 #define wait    sys_wait
 int wait (int *status);
@@ -215,10 +215,15 @@ int kill (int pid, int sig);
 #define popen     _popen
 #define pclose    _pclose
 
+typedef int uid_t;
+typedef int gid_t;
+typedef int pid_t;
+typedef int ssize_t;
+
 /* Encapsulation of system calls */
 #ifndef DONT_ENCAPSULATE
 #define getpid sys_getpid
-int getpid (void);
+pid_t getpid (void);
 #endif
 
 #define DONT_USE_LITOUT
@@ -235,12 +240,12 @@ char *getwd (char *dir);
 void *sbrk (unsigned long increment);
 
 struct passwd;
-struct passwd *getpwuid (int uid);
+struct passwd *getpwuid (uid_t uid);
 struct passwd *getpwnam (const char *name);
-int getuid ();
-int geteuid ();
-int getgid (void);
-int getegid ();
+uid_t getuid (void);
+uid_t geteuid (void);
+gid_t getgid (void);
+gid_t getegid (void);
 #define _timeb timeb
 
 /* Stuff that gets set wrongly or otherwise */