This commit was generated by cvs2svn to compensate for changes in r1398,

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

diff --git a/src/s/mingw32.h b/src/s/mingw32.h
index 0e196fe..4f0fd96 100644 (file)
--- a/src/s/mingw32.h
+++ b/src/s/mingw32.h
@@ -54,19 +54,6 @@ Boston, MA 02111-1307, USA.  */
 #define SHGFI_EXETYPE 0x2000
 #define NSIG 23
 
-#ifndef SPI_GETWHEELSCROLLLINES
-#define SPI_GETWHEELSCROLLLINES 104
-#endif
-#ifndef WHEEL_PAGESCROLL
-#define WHEEL_PAGESCROLL (UINT_MAX)
-#endif
-#ifndef WHEEL_DELTA
-#define WHEEL_DELTA 120
-#endif
-#ifndef WM_MOUSEWHEEL
-#define WM_MOUSEWHEEL 0x20A
-#endif
-
 /* translate NT world unexec stuff to our a.out definitions */
 
 #define strnicmp strncasecmp
@@ -202,8 +189,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,15 +202,10 @@ 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
-pid_t getpid (void);
+int getpid (void);
 #endif
 
 #define DONT_USE_LITOUT
@@ -240,12 +222,12 @@ char *getwd (char *dir);
 void *sbrk (unsigned long increment);
 
 struct passwd;
-struct passwd *getpwuid (uid_t uid);
+struct passwd *getpwuid (int uid);
 struct passwd *getpwnam (const char *name);
-uid_t getuid (void);
-uid_t geteuid (void);
-gid_t getgid (void);
-gid_t getegid (void);
+int getuid ();
+int geteuid ();
+int getgid (void);
+int getegid ();
 #define _timeb timeb
 
 /* Stuff that gets set wrongly or otherwise */