Mercurial > hg > xemacs-beta

changeset 4858:e1d8b6b0c589

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define CYGWIN_HEADERS in s/cygwin32.h and s/mingw32.h instead of syswindows.h, so they're available everywhere
author Ben Wing <ben@xemacs.org>
date Thu, 14 Jan 2010 02:21:17 -0600
parents 34ff4dd7397d
children 262b29aedd54
files src/s/cygwin32.h src/s/mingw32.h src/syswindows.h
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/s/cygwin32.h	Thu Jan 14 02:34:47 2010 -0600
+++ b/src/s/cygwin32.h	Thu Jan 14 02:21:17 2010 -0600
@@ -47,6 +47,9 @@
 /* Identify ourselves */
 #define CYGWIN
 
+/* We are using Cygwin-style headers in /usr/include, also used by MinGW */
+#define CYGWIN_HEADERS
+
 /* cheesy way to determine cygwin version */
 #ifndef NOT_C_CODE
 # include <signal.h>
--- a/src/s/mingw32.h	Thu Jan 14 02:34:47 2010 -0600
+++ b/src/s/mingw32.h	Thu Jan 14 02:21:17 2010 -0600
@@ -27,6 +27,10 @@
 
 #define MINGW
 
+/* We are using Cygwin-style headers in /usr/include, also used by
+   Cygwin itself */
+#define CYGWIN_HEADERS
+
 #ifndef ORDINARY_LINK
 #define ORDINARY_LINK
 #endif
--- a/src/syswindows.h	Thu Jan 14 02:34:47 2010 -0600
+++ b/src/syswindows.h	Thu Jan 14 02:21:17 2010 -0600
@@ -47,8 +47,7 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#if defined (CYGWIN) || defined (MINGW)
-# define CYGWIN_HEADERS
+#ifdef CYGWIN_HEADERS
 # ifndef _WIN32_IE
 #  define _WIN32_IE 0x0400
 # endif