X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fsysfile.h;h=d9d3deb3af51177110ca29492498b243989ac1fd;hb=b073ad3949bbab4cf51e6c5de4725bb150b3ad11;hp=2f6c90d13011647a7494f835e87a1e95b9c1f95b;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git.1

diff --git a/src/sysfile.h b/src/sysfile.h
index 2f6c90d..d9d3deb 100644
--- a/src/sysfile.h
+++ b/src/sysfile.h
@@ -53,6 +53,11 @@ Boston, MA 02111-1307, USA.  */
 #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
 
@@ -170,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
@@ -181,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
@@ -189,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
@@ -256,14 +261,20 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 /* The following definitions are needed under Windows, at least */
-#ifndef X_OK
-# define X_OK 1
-#endif
-
 #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
+# ifdef WIN32_NATIVE
+#  define X_OK R_OK
+# else
+#  define X_OK 1
+# endif
+#endif
+
 #ifndef W_OK
 # define W_OK 2
 #endif