X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fsysfile.h;h=d9d3deb3af51177110ca29492498b243989ac1fd;hp=f573ce3eb2e685988c73361c1dd68c5a298637d1;hb=566b3d194e2d5c783808ac39437bd7e1a28b1c5c;hpb=2fd9701a4f902054649dde9143a3f77809afee8f

diff --git a/src/sysfile.h b/src/sysfile.h
index f573ce3..d9d3deb 100644
--- a/src/sysfile.h
+++ b/src/sysfile.h
@@ -24,9 +24,8 @@ Boston, MA 02111-1307, USA.  */
 #define INCLUDED_sysfile_h_
 
 #include <errno.h>
-#include <limits.h>
 
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 #include <sys/errno.h>          /* <errno.h> does not always imply this */
 #endif
 
@@ -44,17 +43,31 @@ Boston, MA 02111-1307, USA.  */
 #ifndef makedev
 #include <sys/types.h>		/* some typedefs are used in sys/file.h */
 #endif
+
+#ifndef WIN32_NATIVE
 #include <sys/file.h>
+#endif
+
 #include <sys/stat.h>
+
+#ifndef WIN32_NATIVE
+/* Some configuration files' definitions for the LOAD_AVE_CVT macro
+   (like sparc.h's) use macros like FSCALE, defined here. */
+#ifdef HAVE_GTK
+/* I hate GTK */
+#undef MIN
+#undef MAX
+#endif /* HAVE_GTK */
 #include <sys/param.h>
+#endif
 
-#if defined (NeXT) || defined(__CYGWIN32__)
+#if defined (NeXT) || defined(CYGWIN)
 /* what is needed from here?  Do others need it too?
  O_BINARY is in here under cygwin. */
 # include <sys/fcntl.h>
 #endif /* NeXT */
 
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 #include <io.h>
 #include <direct.h>
 #endif
@@ -95,7 +108,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #ifndef CREAT_MODE
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 #define CREAT_MODE	(S_IREAD | S_IWRITE)
 #else
 #define CREAT_MODE	(0666)
@@ -118,6 +131,30 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #endif
 
+#ifndef READ_PLUS_TEXT
+#ifdef O_TEXT
+#define READ_PLUS_TEXT "r+t"
+#else
+#define READ_PLUS_TEXT "r+"
+#endif
+#endif
+
+#ifndef READ_PLUS_BINARY
+#ifdef O_BINARY
+#define READ_PLUS_BINARY "r+b"
+#else
+#define READ_PLUS_BINARY "r+"
+#endif
+#endif
+
+#ifndef WRITE_TEXT
+#ifdef O_TEXT
+#define WRITE_TEXT "wt"
+#else
+#define WRITE_TEXT "w"
+#endif
+#endif
+
 #ifndef WRITE_BINARY
 #ifdef O_BINARY
 #define WRITE_BINARY "wb"
@@ -138,10 +175,10 @@ Boston, MA 02111-1307, USA.  */
    In that case, use ordinary stat instead.  */
 
 #ifndef S_IFLNK
-#define lstat stat
+#define lstat xemacs_stat
 #endif
 
-#if !S_IRUSR
+#ifndef S_IRUSR
 # if S_IREAD
 #  define S_IRUSR S_IREAD
 # else
@@ -149,7 +186,7 @@ Boston, MA 02111-1307, USA.  */
 # endif
 #endif
 
-#if !S_IWUSR
+#ifndef S_IWUSR
 # if S_IWRITE
 #  define S_IWUSR S_IWRITE
 # else
@@ -157,7 +194,7 @@ Boston, MA 02111-1307, USA.  */
 # endif
 #endif
 
-#if !S_IXUSR
+#ifndef S_IXUSR
 # if S_IEXEC
 #  define S_IXUSR S_IEXEC
 # else
@@ -223,8 +260,27 @@ Boston, MA 02111-1307, USA.  */
 # define MAXPATHLEN 1024
 #endif
 
+/* The following definitions are needed under Windows, at least */
+#ifndef R_OK
+# define R_OK 4
+#endif
+
+/* Under native Windows, there is no concept of execute permission,
+   so redefine execute permissions to be the same as read permission */
 #ifndef X_OK
-# define X_OK 01
+# ifdef WIN32_NATIVE
+#  define X_OK R_OK
+# else
+#  define X_OK 1
+# endif
+#endif
+
+#ifndef W_OK
+# define W_OK 2
+#endif
+
+#ifndef F_OK
+# define F_OK 0
 #endif
 
 #ifndef FD_CLOEXEC
@@ -396,24 +452,13 @@ int sys_fstat (int fd, struct stat *buf);
 #endif
 #if defined (ENCAPSULATE_FSTAT) && !defined (DONT_ENCAPSULATE)
 # undef fstat
-/* Need to use arguments to avoid messing with struct stat */
-# define fstat(fd, buf) sys_fstat (fd, buf)
+# define fstat sys_fstat
 #endif
 #if !defined (ENCAPSULATE_FSTAT) && defined (DONT_ENCAPSULATE)
 # define sys_fstat fstat
 #endif
 
-#ifdef ENCAPSULATE_STAT
-int sys_stat (const char *path, struct stat *buf);
-#endif
-#if defined (ENCAPSULATE_STAT) && !defined (DONT_ENCAPSULATE)
-# undef stat
-/* Need to use arguments to avoid messing with struct stat */
-# define stat(path, buf) sys_stat (path, buf)
-#endif
-#if !defined (ENCAPSULATE_STAT) && defined (DONT_ENCAPSULATE)
-# define sys_stat stat
-#endif
+int xemacs_stat (const char *path, struct stat *buf);
 
 /* encapsulations: file-manipulation calls */