CVSROOT: /sources/m4 Module name: m4 Branch: branch-1_4 Changes by: Eric Blake <ericb> 06/06/30 15:06:54
Index: src/m4.h =================================================================== RCS file: /sources/m4/m4/src/m4.h,v retrieving revision 1.1.1.1.2.12 retrieving revision 1.1.1.1.2.13 diff -u -b -r1.1.1.1.2.12 -r1.1.1.1.2.13 --- src/m4.h 22 Jun 2006 23:17:22 -0000 1.1.1.1.2.12 +++ src/m4.h 30 Jun 2006 15:06:54 -0000 1.1.1.1.2.13 @@ -27,12 +27,15 @@ # include <config.h> #endif -/* Canonicalise Windows and Cygwin recognition macros. */ -#if defined __CYGWIN32__ && !defined __CYGWIN__ -# define __CYGWIN__ __CYGWIN32__ +/* Canonicalize UNIX recognition macros. */ +#if defined unix || defined __unix || defined __unix__ \ + || defined _POSIX_VERSION || defined _POSIX2_VERSION +# define UNIX 1 #endif -#if defined _WIN32 && !defined WIN32 -# define WIN32 _WIN32 + +/* Canonicalize Windows recognition macros. */ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# define W32_NATIVE 1 #endif #include <sys/types.h>
