X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fs%2Fwindowsnt.h;h=f60217843fd6a9e4a88f24bd3ca01d7e5169d063;hb=ea21eb75bbf90355514d65686bd53bea579f8e23;hp=1d947726263a0278eaa04b22fa12a247296601e2;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/src/s/windowsnt.h b/src/s/windowsnt.h
index 1d94772..f602178 100644
--- a/src/s/windowsnt.h
+++ b/src/s/windowsnt.h
@@ -125,7 +125,8 @@ typedef int pid_t;
 /* XEmacs file I/O for DOS text files requires FILE_CODING */
 #define FILE_CODING
 
-#define DIRECTORY_SEP '\\'
+extern Lisp_Object Vdirectory_sep_char;
+#define DIRECTORY_SEP ((char)XCHARVAL(Vdirectory_sep_char))
 
 /* Define this to be the separator between devices and paths */
 #define DEVICE_SEP ':'
@@ -269,8 +270,8 @@ int kill (int pid, int sig);
 #define putw      _putw
 #define umask     _umask
 /* #define utime     _utime */
-#define index     strchr
-#define rindex    strrchr
+/* #define index     strchr */
+/* #define rindex    strrchr */
 #define read	  _read
 #define write	  _write
 #define getcwd    _getcwd
@@ -281,10 +282,15 @@ int kill (int pid, int sig);
 
 #endif /* 0 */
 
+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
 
 /* Random global functions called everywhere. Implemented in nt.c */
@@ -299,12 +305,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);
 
 /* Setitimer is emulated */
 #define HAVE_SETITIMER
@@ -370,3 +376,10 @@ int getegid ();
 #pragma data_seg("xdata")
 #pragma bss_seg("xdata")
 #endif
+
+#ifdef HAVE_SCROLLBARS
+/* Ensure the NT 4 mouse definitions in winuser.h are available */
+ #ifndef _WIN32_WINNT
+  #define _WIN32_WINNT 0x0400
+ #endif
+#endif