[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.4.10b-24-g7541b49

[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=7541b497e801dc872e8034cddba77c5fa29b110f

The branch, branch-1.6 has been updated
       via  7541b497e801dc872e8034cddba77c5fa29b110f (commit)
       via  be172ae7ca52f35dbff52d9085a85f08a54d76e1 (commit)
      from  be555668bce19f6a52f2c664bee473001943a926 (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 7541b497e801dc872e8034cddba77c5fa29b110f
Author: Eric Blake <address@hidden>
Date:   Fri Apr 11 09:53:29 2008 -0600

    Improve OS/2+emx build.
    
    * src/m4.h [__EMX__]: OS/2 does not have a Unix-compatible
    system(3), no matter what other macros it pre-defined.
    * doc/m4.texinfo (Mkstemp): Rework test to avoid globbing failure
    on OS/2.
    * src/builtin.c (predefined_tab): Ensure all possible system
    identifiers are defined, not just the first; the testsuite will
    catch if multiple identifiers mistakenly made it through.
    * examples/null.m4 (esyscmd): Don't rely on printf to generate NUL
    byte.
    * examples/null.out (esyscmd): Check for esyscmd success.
    * THANKS: Update.
    Reported by Elbert Pol.
    
    Signed-off-by: Eric Blake <address@hidden>

commit be172ae7ca52f35dbff52d9085a85f08a54d76e1
Author: Eric Blake <address@hidden>
Date:   Fri Apr 11 09:12:46 2008 -0600

    Fix mingw build.
    
    * src/builtin.c (define_user_macro): Avoid compiler warning.
    * NEWS: Tweak 1.4.10b entry.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog         |   20 ++++++++++++++++++++
 NEWS              |    2 ++
 THANKS            |    1 +
 doc/m4.texinfo    |   10 ++++++----
 examples/null.m4  |  Bin 5747 -> 5863 bytes
 examples/null.out |  Bin 402 -> 404 bytes
 src/builtin.c     |   11 +++++++----
 src/m4.h          |    1 +
 8 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f8d76f..c5685ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-04-11  Eric Blake  <address@hidden>
+
+       Improve OS/2+emx build.
+       * src/m4.h [__EMX__]: OS/2 does not have a Unix-compatible
+       system(3), no matter what other macros it pre-defined.
+       * doc/m4.texinfo (Mkstemp): Rework test to avoid globbing failure
+       on OS/2.
+       * src/builtin.c (predefined_tab): Ensure all possible system
+       identifiers are defined, not just the first; the testsuite will
+       catch if multiple identifiers mistakenly made it through.
+       * examples/null.m4 (esyscmd): Don't rely on printf to generate NUL
+       byte.
+       * examples/null.out (esyscmd): Check for esyscmd success.
+       * THANKS: Update.
+       Reported by Elbert Pol.
+
+       Fix mingw build.
+       * src/builtin.c (define_user_macro): Avoid compiler warning.
+       * NEWS: Tweak 1.4.10b entry.
+
 2008-04-09  Eric Blake  <address@hidden>
 
        Remove redundant configure macros.
diff --git a/NEWS b/NEWS
index 4cc0ff1..58fddef 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,8 @@ contains the following beta features that were deemed worth 
deferring until
    algorithms based on `$@' operate in linear, rather than quadratic, time
    and memory.
 
+** A number of portability improvements inherited from gnulib.
+
 * Noteworthy changes in Version 1.4.11 (2008-04-02) [stable]
   Released by Eric Blake, based on git version 1.4.10a
 
diff --git a/THANKS b/THANKS
index 01c560f..ab08e6d 100644
--- a/THANKS
+++ b/THANKS
@@ -29,6 +29,7 @@ Damian Menscher               address@hidden
 Dan Jacobson           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
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 690ea79..4a523c6 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -6481,11 +6481,13 @@ sysval
 @c the expansion.
 
 @example
-syscmd(`rm -f foo??????')sysval
+syscmd(`rm -rf foodir')sysval
 @result{}0
-len(mkstemp(`fooXXXXX'))
address@hidden
-syscmd(`rm foo??????')sysval
+syscmd(`mkdir foodir')sysval
address@hidden
+len(mkstemp(`foodir/fooXXXXX'))
address@hidden
+syscmd(`rm -r foodir')sysval
 @result{}0
 @end example
 
diff --git a/examples/null.m4 b/examples/null.m4
index 79f4715..7cf123f 100644
Binary files a/examples/null.m4 and b/examples/null.m4 differ
diff --git a/examples/null.out b/examples/null.out
index aca4b78..cd3764f 100644
Binary files a/examples/null.out and b/examples/null.out differ
diff --git a/src/builtin.c b/src/builtin.c
index b5541cf..e9856a8 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -154,11 +154,14 @@ predefined_tab[] =
 {
 #if UNIX
   { "unix",    "__unix__",     "" },
-#elif W32_NATIVE
+#endif
+#if W32_NATIVE
   { "windows", "__windows__",  "" },
-#elif OS2
+#endif
+#if OS2
   { "os2",     "__os2__",      "" },
-#else
+#endif
+#if !UNIX && !W32_NATIVE && !OS2
 # warning Platform macro not provided
 #endif
   { NULL,      "__gnu__",      "" },
@@ -461,7 +464,7 @@ define_user_macro (const char *name, size_t name_len, const 
char *text,
              offset = regs->end[0];
              m4_warn (0, NULL,
                       _("definition of `%s' contains sequence `%.*s'"),
-                      name, regs->end[0] - regs->start[0],
+                      name, (int) (regs->end[0] - regs->start[0]),
                       defn + regs->start[0]);
            }
        }
diff --git a/src/m4.h b/src/m4.h
index 3e7fc76..54dd9da 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -69,6 +69,7 @@
 /* Canonicalize OS/2 recognition macro.  */
 #ifdef __EMX__
 # define OS2 1
+# undef UNIX
 #endif
 
 /* Used for version mismatch, when -R detects a frozen file it can't parse.  */


hooks/post-receive
--
GNU M4 source repository