update.

[chise/xemacs-chise.git.1] / src / sysdep.h

diff --git a/src/sysdep.h b/src/sysdep.h
index 8b50a1f..0e374c2 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -20,16 +20,18 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: FSF 19.30.  Split out of sysdep.c/emacs.c. */
 
-#ifndef _XEMACS_SYSDEP_H_
-#define _XEMACS_SYSDEP_H_
+#ifndef INCLUDED_sysdep_h_
+#define INCLUDED_sysdep_h_
 
 #include <setjmp.h>
 
+#ifndef WIN32_NATIVE
 extern char **environ;
+#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);
+#ifdef PDUMP
+int pdump_read_file (char **pdump_start_pos, size_t *pdump_length);
+#endif
 
 int eight_bit_tty (struct device *d);
 
@@ -48,7 +50,9 @@ Bufbyte get_eof_char (int fd);
 
 /* 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)
@@ -59,7 +63,7 @@ void child_setup_tty (int out);
 
 /* Suspend the Emacs process; give terminal to its superior.  */
 void sys_suspend (void);
-/* Suspend a process if possible; give termianl to its superior. */
+/* Suspend a process if possible; give terminal to its superior. */
 void sys_suspend_process (int process);
 
 void request_sigio (void);
@@ -78,10 +82,10 @@ void reset_poll_for_quit (void);
 extern JMP_BUF break_system_call_jump;
 extern volatile int can_break_system_calls;
 
-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);
+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);
 
 /* Call these functions if you want to change some terminal parameter --
    reset the console, change the parameter, and init it again. */
@@ -142,11 +146,11 @@ char *end_of_data (void);
 void init_system_name (void);
 
 #ifndef HAVE_GETCWD
-char *getcwd (char *pathname, int size);
+char *getcwd (char *pathname, size_t 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
@@ -158,15 +162,10 @@ int dup2 (int oldd, int newd);
 # ifdef strerror
 # undef strerror
 # endif
-CONST char *strerror (int);
-#endif
-
-#ifdef WINDOWSNT
-void mswindows_set_errno (unsigned long win32_error);
-void mswindows_set_last_errno (void);
+const char *strerror (int);
 #endif
 
-int interruptible_open (CONST char *path, int oflag, int mode);
+int interruptible_open (const char *path, int oflag, int mode);
 
 #ifndef HAVE_H_ERRNO
 extern int h_errno;
@@ -175,7 +174,7 @@ extern int h_errno;
 #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 /* _XEMACS_SYSDEP_H_ */
+#endif /* INCLUDED_sysdep_h_ */