xemacs-beta: src/s/windowsnt.h comparison

comparison src/s/windowsnt.h @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29

author	cvs
date	Mon, 13 Aug 2007 11:13:30 +0200
parents	064ab7fed2e0
children	a86b2b5e0111

comparison

equal deleted inserted replaced

-:f4aeb21a5bad
+:74fd4e045ea6
 /* define MAIL_USE_FLOCK if the mailer uses flock
 to interlock access to /usr/spool/mail/$USER.
 The alternative is that a lock file named
 /usr/spool/mail/$USER.lock.  */
-/* #define MAIL_USE_FLOCK */
 #define MAIL_USE_POP
-#define MAIL_USE_SYSTEM_LOCK
+#define HAVE_LOCKING
+#define MAIL_USE_LOCKING
 /* If the character used to separate elements of the executable path
 is not ':', #define this to be the appropriate character constant.  */
 #define SEPCHAR ';'
 (Which you should place, by convention, in sysdep.c).  */
 /* XEmacs file I/O for DOS text files requires FILE_CODING */
 #define FILE_CODING
-#define DIRECTORY_SEP '\\'
+#define DIRECTORY_SEP ((char)XCHAR(Vdirectory_sep_char))
 /* Define this to be the separator between devices and paths */
 #define DEVICE_SEP ':'
 /* We'll support either convention on NT.  */
 #define srandom(seed) (srand(seed))
 #define setpgrp(pid,gid)
 #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B")
-/* get some redefinitions in place */
-#if 0
-/* IO calls that are emulated or shadowed */
-#define access  sys_access
-#define chdir   sys_chdir
-#define chmod   sys_chmod
-#define close   sys_close
-#define creat   sys_creat
-#define ctime sys_ctime
-#define dup     sys_dup
-#define dup2    sys_dup2
-#define fopen   sys_fopen
-#define link    sys_link
-#define mktemp  sys_mktemp
-#define open    sys_open
-#define read    sys_read
-#define rename  sys_rename
-#define unlink  sys_unlink
-#define write   sys_write
-#define mkdir   sys_mkdir
-#define rmdir   sys_rmdir
-#endif
-#if 0
-/* this is hacky, but is necessary to avoid warnings about macro
-redefinitions using the SDK compilers */
-#ifndef __STDC__
-#define __STDC__ 1
-#define MUST_UNDEF__STDC__
-#endif
-#include <direct.h>
-#include <io.h>
 #include <stdio.h>
-#ifdef MUST_UNDEF__STDC__
-#undef __STDC__
+/* subprocess calls that are emulated */
-#undef MUST_UNDEF__STDC__
+#ifndef DONT_ENCAPSULATE
-#endif
+#define spawnve sys_spawnve
-#endif
+int spawnve (int mode, const char *cmdname,
+	     const char * const *argv, const char *const *envp);
-#include <stdio.h>
+#endif
 /* IO calls that are emulated or shadowed */
 #define pipe    sys_pipe
 int sys_pipe (int * phandles);
 #ifndef HAVE_X_WINDOWS
 #define sleep   sys_sleep
 void sleep (int seconds);
 #endif
-/* subprocess calls that are emulated */
-#define spawnve sys_spawnve
-int spawnve (int mode, CONST char *cmdname,
-	     CONST char * CONST *argv, CONST char *CONST *envp);
 #define wait    sys_wait
 int wait (int *status);
 #define kill    sys_kill
 int kill (int pid, int sig);
 /* map to MSVC names */
 #define popen     _popen
 #define pclose    _pclose
-#if 0
+typedef int uid_t;
-#define chdir     _chdir
+typedef int gid_t;
-#define execlp    _execlp
+typedef int pid_t;
-#define execvp    _execvp
+typedef int ssize_t;
-#define fcloseall _fcloseall
-#define fdopen    _fdopen
-#define fgetchar  _fgetchar
-#define fileno    _fileno
-#define flushall  _flushall
-#define fputchar  _fputchar
-#define getw      _getw
-#define getpid    _getpid
-#define isatty    _isatty
-#define logb      _logb
-#define _longjmp  longjmp
-#define lseek     _lseek
-#define putw      _putw
-#define umask     _umask
-/* #define utime     _utime */
-/* #define index     strchr */
-/* #define rindex    strrchr */
-#define read	  _read
-#define write	  _write
-#define getcwd    _getcwd
-#ifdef HAVE_NTGUI
-#define abort	win32_abort
-#endif
-#endif /* 0 */
 /* 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 */
 /* #### Most of these are FSFisms and must be avoided */
 /* #### All of these are FSFisms and must be avoided */
 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 ();
+uid_t getuid (void);
-int geteuid ();
+uid_t geteuid (void);
-int getgid (void);
+gid_t getgid (void);
-int getegid ();
+gid_t getegid (void);
 /* Setitimer is emulated */
 #define HAVE_SETITIMER
 /* We now have emulation for some signals */
 #define HAVE_SIGHOLD
 #define sigset(s,h) msw_sigset(s,h)
 #define sighold(s) msw_sighold(s)
 #define sigrelse(s) msw_sigrelse(s)
 #define sigpause(s) msw_sigpause(s)
-#define signal sigset
 /* Defines that we need that aren't in the standard signal.h  */
 #define SIGHUP  1               /* Hang up */
 #define SIGQUIT 3               /* Quit process */
 #define SIGKILL 9               /* Die, die die */
 #define SIGPROF 29		/* Profiling timer exp */
 /* For integration with MSDOS support.  */
 #define getdisk()               (_getdrive () - 1)
 #define getdefdir(_drv, _buf)   _getdcwd (_drv, _buf, MAXPATHLEN)
-#if 0 /* they do. -kkm */
-/* Define this so that winsock.h definitions don't get included when windows.h
-is...  I don't know if they do the right thing for emacs.  For this to
-have proper effect, config.h must always be included before windows.h.  */
-#define _WINSOCKAPI_    1
-#endif /* 0 */
 /* Defines size_t and alloca ().  */
 #include <malloc.h>
 #include <sys/stat.h>
 #endif
 #ifdef DUMP_SEPARATE_SECTION
 #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

Mercurial > hg > xemacs-beta

comparison src/s/windowsnt.h @ 398:74fd4e045ea6 r21-2-29