FYI: forward port QNX 6.3 support from branch-1-4 [m4--devo--1.0--patch-7]

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.

  * looking for address@hidden/m4--devo--1.0--patch-6 to compare with
  * comparing to address@hidden/m4--devo--1.0--patch-6
  M  configure.ac
  M  ChangeLog
  M  src/main.c
  M  src/stackovf.c
  M  src/m4.h
  
  * modified files
  
  Index: Changelog
  from  Vincent Lonngren  <address@hidden>
  
        Forward port of a patch that allowed m4-1.4.2 to compile on
        QNX 6.3:
  
        * configure.ac (AC_CHECK_HEADERS):  Add signal.h,
        sys/signal.h.
        * src/m4.h: And include them as appropriate.
        * src/main.c, src/stackovf.h: Don't include signal.h literally;
        m4.h will include the correct file.
  
  --- orig/configure.ac
  +++ mod/configure.ac
  @@ -178,7 +178,8 @@
   ## C headers required by M4. ##
   ## ------------------------- ##
   AC_HEADER_STDC
  -AC_CHECK_HEADERS(limits.h locale.h memory.h string.h unistd.h errno.h)
  +AC_CHECK_HEADERS([limits.h locale.h memory.h string.h unistd.h errno.h])
  +AC_CHECK_HEADERS([signal.h sys/signal.h], break)
   
   if test $ac_cv_header_stdbool_h = yes; then
     INCLUDE_STDBOOL_H='#include <stdbool.h>'
  @@ -192,7 +193,7 @@
   ## --------------------------------- ##
   ## Library functions required by M4. ##
   ## --------------------------------- ##
  -AC_CHECK_FUNCS(bzero calloc mkstemp mktemp strerror tmpfile)
  +AC_CHECK_FUNCS([bzero calloc mkstemp mktemp strerror tmpfile])
   AC_FUNC_ALLOCA
   AC_FUNC_VPRINTF
   
  
  
  --- orig/src/m4.h
  +++ mod/src/m4.h
  @@ -93,6 +93,12 @@
   # define setlocale(Category, Locale)
   #endif
   
  +#if HAVE_SIGNAL_H
  +# include <signal.h>
  +#elif HAVE_SYS_SIGNAL_H
  +# include <sys/signal.h>
  +#endif
  +
   #include "ltdl.h"
   
   /* Error handling.  */
  
  
  --- orig/src/main.c
  +++ mod/src/main.c
  @@ -19,8 +19,6 @@
      02110-1301  USA
   */
   
  -#include <signal.h>
  -
   #include "m4.h"
   #include "m4private.h"
   #include "getopt.h"
  
  
  --- orig/src/stackovf.c
  +++ mod/src/stackovf.c
  @@ -85,7 +85,6 @@
   #include <assert.h>
   #include <sys/time.h>
   #include <sys/resource.h>
  -#include <signal.h>
   
   #if HAVE_SIGINFO_H
   # include <siginfo.h>
  
  
  
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCeUa6FRMICSmD1gYRAsBXAJ4p1pgYGy4UBR7dnX0R7aCcId+ARgCgyPEF
d4b9ow/IfnpqhJCxBQ9wCFc=
=/14R
-----END PGP SIGNATURE-----