[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-94-g03c4e54

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=03c4e545afedafff51cce3a73aec5172482c0120

The branch, master has been updated
       via  03c4e545afedafff51cce3a73aec5172482c0120 (commit)
      from  eef195f8cdc361d819914e82fcf2b0bdf559000c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03c4e545afedafff51cce3a73aec5172482c0120
Author: Eric Blake <address@hidden>
Date:   Mon Apr 14 17:14:33 2008 -0600

    Improve OS/2 detection.
    
    * modules/gnu.c (m4_macro_table): Ensure all possible identifiers
    are defined, not just the first.  The testsuite ensures that
    exactly one gets defined.
    * m4/system_.h [__EMX__]: OS/2 is not Unix-compatible, no matter
    what other pre-defined macros it has.
    * THANKS: Update.
    Reported by Elbert Pol.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    9 +++++++++
 THANKS        |    2 ++
 m4/system_.h  |    4 +++-
 modules/gnu.c |    8 ++++----
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a034407..af55ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-04-14  Eric Blake  <address@hidden>
 
+       Improve OS/2 detection.
+       * modules/gnu.c (m4_macro_table): Ensure all possible identifiers
+       are defined, not just the first.  The testsuite ensures that
+       exactly one gets defined.
+       * m4/system_.h [__EMX__]: OS/2 is not Unix-compatible, no matter
+       what other pre-defined macros it has.
+       * THANKS: Update.
+       Reported by Elbert Pol.
+
        Ensure __m4_version__ is unquoted.
        * tests/builtins.at (__m4_@&address@hidden): Augment test.
 
diff --git a/THANKS b/THANKS
index 6c8bedd..6d476d3 100644
--- a/THANKS
+++ b/THANKS
@@ -37,6 +37,7 @@ Dan Jacobson          address@hidden
 Daniel Richard G.      address@hidden
 David J. MacKenzie     address@hidden
 David Perlin           address@hidden
+Elbert Pol             address@hidden
 Erez Zadok             address@hidden
 Eric Allman            address@hidden
 Eric Backus            address@hidden
@@ -78,6 +79,7 @@ Keith Bostic          address@hidden
 Konrad Schwarz         address@hidden
 Kristine Lund          address@hidden
 Krste Asanovic         address@hidden
+Lawson Chan            address@hidden
 M. Levinson            address@hidden
 Marcus Daniels         address@hidden
 Marion Hakanson                address@hidden
diff --git a/m4/system_.h b/m4/system_.h
index f1e9602..2c9e1a7 100644
--- a/m4/system_.h
+++ b/m4/system_.h
@@ -1,5 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2000, 2001, 2003, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2003, 2006, 2007, 2008 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
@@ -104,6 +105,7 @@ BEGIN_C_DECLS
 /* Canonicalize OS/2 recognition macro.  */
 #ifdef __EMX__
 # define OS2 1
+# undef UNIX
 #endif
 
 
diff --git a/modules/gnu.c b/modules/gnu.c
index 1cf4a60..b481581 100644
--- a/modules/gnu.c
+++ b/modules/gnu.c
@@ -85,12 +85,12 @@ m4_macro m4_macro_table[] =
   /* name              text    min     max */
 #if UNIX
   { "__unix__",                "",     0,      0 },
-#elif W32_NATIVE
+#endif
+#if W32_NATIVE
   { "__windows__",     "",     0,      0 },
-#elif OS2
+#endif
+#if OS2
   { "__os2__",         "",     0,      0 },
-#else
-# warning Platform macro not provided
 #endif
   { "__gnu__",         "",     0,      0 },
   { "__m4_version__",  VERSION,0,      0 },


hooks/post-receive
--
GNU M4 source repository