projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync up with r21-4-11-chise-0_21-=daikanwa-rev1+2.
[chise/xemacs-chise.git-]
/
src
/
sysdep.h
diff --git
a/src/sysdep.h
b/src/sysdep.h
index
e4c3296
..
0e374c2
100644
(file)
--- a/
src/sysdep.h
+++ b/
src/sysdep.h
@@
-20,12
+20,18
@@
Boston, MA 02111-1307, USA. */
/* Synched up with: FSF 19.30. Split out of sysdep.c/emacs.c. */
/* 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>
#include <setjmp.h>
+#ifndef WIN32_NATIVE
extern char **environ;
extern char **environ;
+#endif
+
+#ifdef PDUMP
+int pdump_read_file (char **pdump_start_pos, size_t *pdump_length);
+#endif
int eight_bit_tty (struct device *d);
int eight_bit_tty (struct device *d);
@@
-44,10
+50,7
@@
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) */
/* Wait for subprocess with process id `pid' to terminate and
make sure it will get eliminated (not remain forever as a zombie) */
-#ifdef WINDOWSNT
-#include <windows.h>
-void wait_for_termination (HANDLE pid);
-#else
+#ifndef WIN32_NATIVE
void wait_for_termination (int pid);
#endif
void wait_for_termination (int pid);
#endif
@@
-79,7
+82,7
@@
void reset_poll_for_quit (void);
extern JMP_BUF break_system_call_jump;
extern volatile int can_break_system_calls;
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,
+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 allow_quit);
ssize_t sys_read_1 (int fildes, void *buf, size_t nbyte,
int allow_quit);
@@
-143,11
+146,11
@@
char *end_of_data (void);
void init_system_name (void);
#ifndef HAVE_GETCWD
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
#endif
#ifndef HAVE_RENAME
-int rename (CONST char *from, CONST char *to);
+int rename (const char *from, const char *to);
#endif
#ifndef HAVE_DUP2
#endif
#ifndef HAVE_DUP2
@@
-159,15
+162,10
@@
int dup2 (int oldd, int newd);
# ifdef strerror
# undef strerror
# endif
# 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
#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;
#ifndef HAVE_H_ERRNO
extern int h_errno;
@@
-176,7
+174,7
@@
extern int h_errno;
#ifdef HAVE_REALPATH
#define xrealpath realpath
#else
#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
-#endif /* _XEMACS_SYSDEP_H_ */
+#endif /* INCLUDED_sysdep_h_ */