Mercurial > hg > xemacs-beta

diff src/sysfile.h @ 558:ed498ef2108b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-23 09:59:33 by ben] xemacs.mak: call `ver' to get the exact os version and put it in the installation; suggestion from adrian. behavior-defs.el: Add scroll-in-place, jka-compr, efs, fix up some things. pop.c: Remove BROKEN_CYGWIN. etc\sample.init.el: Rewrite to be much more careful about loading features -- now it decays gracefully even in the complete absence of packages. Also avoid doing obnoxious things when loading efs. configure.in: add some support for eventually turning on file coding by default. Fix numerous places where AC_MSG_WARN had quotes around its arg, which is bad. Replace with []. Same for AC_MSG_ERROR. s\cygwin32.h, s\mingw32.h: remove support for way old beta versions of cygwin. don't put -Wno-sign-compare in the system switches; this isn't a system issue. define BROKEN_SIGIO for cygwin to get C-g support. device-msw.c: signal an error rather than crash with an unavailable network printer (from Mike Alexander). event-msw.c: cleanup headers. fix (hopefully) an error with data corruption when sending to a network connection. fileio.c: Fix evil code that attempts to handle the ~user prefix by (a) always assuming we're referencing ourselves and not even verifying the user -- hence any file with a tilde as its first char is invalid! (b) if there wasn't a slash following the filename, the pointer was set *past* the end of file and we started reading from uninitialized memory. Now we simply treat these as files, always. optionally for 21.4 (doc fix): lread.c: cambia de pas_de_lache_ici -- al minimo usa la palabra certa. frame.c: fix warnings. emacs.c, nt.c, ntproc.c, process-nt.c, realpath.c, unexnt.c: rename MAX_PATH to standard PATH_MAX. process-nt.c, realpath.c: cleanup headers. process-unix.c, sysdep.c, systime.h, syswindows.h: kill BROKEN_CYGWIN and support for way old beta versions of cygwin. sysfile.h: use _MAX_PATH (Windows) preferentially for PATH_MAX if defined. include io.h on Cygwin (we need get_osfhandle()). include sys/fcntl.h always, since we were including it in various header files anyway. unexcw.c: fix up style to conform to standard. remove duplicate definition of PERROR. buffer.c: comment change. database.c, debug.h, device-tty.c, dired-msw.c, glyphs-msw.c: header cleanups (remove places that directly include a system header file, because we have our own layer to do this more cleanly and portably); indentation fixes.
author ben
date Wed, 23 May 2001 09:59:48 +0000
parents 0784d089fdc9
children 6cca1c9bdc85
line wrap: on
line diff
--- a/src/sysfile.h	Tue May 22 06:49:43 2001 +0000
+++ b/src/sysfile.h	Wed May 23 09:59:48 2001 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 2001 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -26,11 +27,11 @@
 #include <errno.h>
 
 #ifndef WIN32_NATIVE
-#include <sys/errno.h>          /* <errno.h> does not always imply this */
+# include <sys/errno.h>          /* <errno.h> does not always imply this */
 #endif
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 #ifndef INCLUDED_FCNTL
@@ -38,38 +39,39 @@
 # include <fcntl.h>
 #endif /* INCLUDED_FCNTL */
 
-/* Load sys/types.h if not already loaded.
+/* The anonymous voice of the past says:
    In some systems loading it twice is suicidal.  */
-#ifndef makedev
-#include <sys/types.h>		/* some typedefs are used in sys/file.h */
-#endif
+#ifndef INCLUDED_SYS_TYPES
+# define INCLUDED_SYS_TYPES
+# include <sys/types.h>		/* some typedefs are used in sys/file.h */
+#endif /* INCLUDED_SYS_TYPES */
 
 #ifndef WIN32_NATIVE
-#include <sys/file.h>
+# include <sys/file.h>
 #endif
 
 #include <sys/stat.h>
 
-#ifndef WIN32_NATIVE
+#if defined (WIN32_NATIVE) || defined (CYGWIN)
+# include <io.h>
+#endif
+
+#ifdef WIN32_NATIVE
+# include <direct.h>
+#else
 /* Some configuration files' definitions for the LOAD_AVE_CVT macro
    (like sparc.h's) use macros like FSCALE, defined here. */
-#ifdef HAVE_GTK
+# ifdef HAVE_GTK
 /* I hate GTK */
-#undef MIN
-#undef MAX
-#endif /* HAVE_GTK */
-#include <sys/param.h>
-#endif
-
-#if defined (NeXT) || defined(CYGWIN)
-/* what is needed from here?  Do others need it too?
- O_BINARY is in here under cygwin. */
+#  undef MIN
+#  undef MAX
+# endif /* HAVE_GTK */
+# include <sys/param.h>
+/* We used to conditionalize this on defined (NeXT) || defined (CYGWIN),
+   with the comment "what is needed from here?  Do others need it too?
+   O_BINARY is in here under cygwin." sunplay.c needed this, so let's
+   just include it always and fix any breakage (unlikely) that happens. */
 # include <sys/fcntl.h>
-#endif /* NeXT */
-
-#ifdef WIN32_NATIVE
-#include <io.h>
-#include <direct.h>
 #endif
 
 #ifndef	STDERR_FILENO
@@ -246,7 +248,10 @@
 
 /* Client .c files should simply use `PATH_MAX'. */
 #ifndef PATH_MAX
-# if defined (_POSIX_PATH_MAX)
+# if defined (_MAX_PATH)
+/* MS Win -- and preferable to _POSIX_PATH_MAX, which is also defined */
+#  define PATH_MAX _MAX_PATH
+# elif defined (_POSIX_PATH_MAX)
 #  define PATH_MAX _POSIX_PATH_MAX
 # elif defined (MAXPATHLEN)
 #  define PATH_MAX MAXPATHLEN