branch-1_4 portability

[Eric Blake]

Compiling with native Solaris 7 revealed the following:

2006-07-28  Eric Blake  <address@hidden>

        * Makefile.am (MAINTAINERCLEANFILES): Fix typo that tripped up
        several non-GNU makes.
        * src/stackovf.c (setup_stackovf_trap): Missed _ from yesterday.
        * src/m4.h: Likewise.
        * src/input.c (push_wrapup): Avoid compiler warning with Solaris
        /usr/ccs/bin/ucbcc.

Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.25.2.9
diff -u -r1.25.2.9 Makefile.am
--- Makefile.am 13 Jul 2006 12:50:47 -0000      1.25.2.9
+++ Makefile.am 28 Jul 2006 20:36:53 -0000
@@ -27,7 +27,7 @@
 ## maintainer-clean should remove as much as possible that ./bootstrap can
 ## recreate.  In the m4 directory, keep only gnulib-cache.m4.
 MAINTAINERCLEANFILES = COPYING INSTALL Makefile.in aclocal.m4 \
-       config-h.in configure depcomp doc/fdl.texi gendocs.sh install-sh
+       config-h.in configure depcomp doc/fdl.texi gendocs.sh install-sh \
        lib/* m4/[a-fh-z]* m4/g[a-mo-z]* m4/gnulib-comp.m4 m4/gnulib-tool.m4 \
        missing stamp-h.in
 
Index: src/input.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/input.c,v
retrieving revision 1.1.1.1.2.11
diff -u -r1.1.1.1.2.11 input.c
--- src/input.c 26 Jul 2006 23:21:29 -0000      1.1.1.1.2.11
+++ src/input.c 28 Jul 2006 20:36:53 -0000
@@ -276,8 +276,9 @@
 void
 push_wrapup (const char *s)
 {
-  input_block *i = (input_block *) obstack_alloc (wrapup_stack,
-                                                 sizeof (struct input_block));
+  input_block *i;
+  i = (input_block *) obstack_alloc (wrapup_stack,
+                                     sizeof (struct input_block));
   i->prev = wsp;
   i->type = INPUT_STRING;
   i->u.u_s.string = obstack_copy0 (wrapup_stack, s, strlen (s));
Index: src/m4.h
===================================================================
RCS file: /sources/m4/m4/src/m4.h,v
retrieving revision 1.1.1.1.2.20
diff -u -r1.1.1.1.2.20 m4.h
--- src/m4.h    27 Jul 2006 21:41:12 -0000      1.1.1.1.2.20
+++ src/m4.h    28 Jul 2006 20:36:53 -0000
@@ -116,8 +116,8 @@
 void reference_error (void);
 
 #ifdef USE_STACKOVF
-void setup_stackovf_trap _((char *const *, char *const *,
-                           void (*handler) (void)));
+void setup_stackovf_trap (char *const *, char *const *,
+                          void (*handler) (void));
 #endif
 
 /* File: debug.c  --- debugging and tracing function.  */
Index: src/stackovf.c
===================================================================
RCS file: /sources/m4/m4/src/stackovf.c,v
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.3 stackovf.c
--- src/stackovf.c      27 Jul 2006 21:41:12 -0000      1.1.1.1.2.3
+++ src/stackovf.c      28 Jul 2006 20:36:53 -0000
@@ -375,7 +375,7 @@
 # if HAVE_STRUCT_SIGACTION_SA_SIGACTION
   act.sa_sigaction = sigsegv_handler;
 # else /* ! HAVE_STRUCT_SIGACTION_SA_SIGACTION */
-  act.sa_handler = (RETSIGTYPE (*) _((int))) sigsegv_handler;
+  act.sa_handler = (RETSIGTYPE (*) (int)) sigsegv_handler;
 # endif /* ! HAVE_STRUCT_SIGACTION_SA_SIGACTION */
   sigemptyset (&act.sa_mask);
   act.sa_flags = (SA_ONSTACK | SA_RESETHAND | SA_SIGINFO);
@@ -384,7 +384,7 @@
 
 #else /* ! HAVE_SIGACTION */
 
-  vec.sv_handler = (RETSIGTYPE (*)_ ((int))) sigsegv_handler;
+  vec.sv_handler = (RETSIGTYPE (*) (int)) sigsegv_handler;
   vec.sv_mask = 0;
   vec.sv_flags = (SV_ONSTACK | SV_RESETHAND);
   if (sigvec (SIGSEGV, &vec, NULL) < 0)