--- a/src/sysdep.h	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/sysdep.h	Mon Aug 13 11:20:41 2007 +0200
@@ -20,18 +20,16 @@
 
 /* Synched up with: FSF 19.30.  Split out of sysdep.c/emacs.c. */
 
-#ifndef INCLUDED_sysdep_h_
-#define INCLUDED_sysdep_h_
+#ifndef _XEMACS_SYSDEP_H_
+#define _XEMACS_SYSDEP_H_
 
 #include <setjmp.h>
 
-#ifndef WIN32_NATIVE
 extern char **environ;
-#endif
 
-#ifdef PDUMP
-int pdump_read_file (char **pdump_start_pos, size_t *pdump_length);
-#endif
+struct emacs_tty;
+int emacs_get_tty (int fd, struct emacs_tty *settings);
+int emacs_set_tty (int fd, struct emacs_tty *settings, int waitp);
 
 int eight_bit_tty (struct device *d);
 
@@ -50,9 +48,7 @@
 
 /* Wait for subprocess with process id `pid' to terminate and
    make sure it will get eliminated (not remain forever as a zombie) */
-#ifndef WIN32_NATIVE
 void wait_for_termination (int pid);
-#endif
 
 /* flush any pending output
  * (may flush input as well; it does not matter the way we use it)
@@ -82,10 +78,10 @@
 extern JMP_BUF break_system_call_jump;
 extern volatile int can_break_system_calls;
 
-ssize_t sys_write_1 (int fildes, const void *buf, size_t nbyte,
-		     int allow_quit);
-ssize_t sys_read_1 (int fildes, void *buf, size_t nbyte,
-		    int allow_quit);
+int sys_write_1 (int fildes, CONST void *buf, size_t nbyte,
+		 int allow_quit);
+int sys_read_1 (int fildes, void *buf, size_t nbyte,
+		int allow_quit);
 
 /* Call these functions if you want to change some terminal parameter --
    reset the console, change the parameter, and init it again. */
@@ -146,11 +142,11 @@
 void init_system_name (void);
 
 #ifndef HAVE_GETCWD
-char *getcwd (char *pathname, size_t size);
+char *getcwd (char *pathname, int size);
 #endif
 
 #ifndef HAVE_RENAME
-int rename (const char *from, const char *to);
+int rename (CONST char *from, CONST char *to);
 #endif
 
 #ifndef HAVE_DUP2
@@ -162,10 +158,15 @@
 # ifdef strerror
 # undef strerror
 # endif
-const char *strerror (int);
+CONST char *strerror (int);
 #endif
 
-int interruptible_open (const char *path, int oflag, int mode);
+#ifdef WINDOWSNT
+void mswindows_set_errno (unsigned long win32_error);
+void mswindows_set_last_errno (void);
+#endif
+
+int interruptible_open (CONST char *path, int oflag, int mode);
 
 #ifndef HAVE_H_ERRNO
 extern int h_errno;
@@ -174,7 +175,7 @@
 #ifdef HAVE_REALPATH
 #define xrealpath realpath
 #else
-char *xrealpath(const char *path, char resolved_path []);
+char *xrealpath(CONST char *path, char resolved_path []);
 #endif
 
-#endif /* INCLUDED_sysdep_h_ */
+#endif /* _XEMACS_SYSDEP_H_ */