FYI: 71-gary-gnulib-exit-import.patch

[Gary V. Vaughan]

Applied to HEAD.
--
  ())_.  Gary V. Vaughan    gary@(lilith.warpmail.net|gnu.org)
  ( '/   Research Scientist http://www.oranda.demon.co.uk       ,_())____
  / )=   GNU Hacker         http://www.gnu.org/software/libtool  \'      `&
`(_~)_   Tech' Author       http://sources.redhat.com/autobook   =`---d__/

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * gnulib/m4/exit.h: Import exit module from CVS gnulib.
        * gnulib/m4/Makefile.am (pkginclude_HEADERS): Add exit.h.
        * m4/system_.h: Don't define EXIT_SUCCESS and FAILURE, include
        exit.h instead.

Index: m4/system_.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/system_.h,v
retrieving revision 1.6
diff -u -p -u -r1.6 system_.h
--- m4/system_.h 12 Sep 2003 13:27:54 -0000 1.6
+++ m4/system_.h 16 Sep 2003 15:02:55 -0000
@@ -34,6 +34,7 @@
 @INCLUDE_OBSTACK_H@
 @INCLUDE_REGEX_H@
 @INCLUDE_STDBOOL_H@
+#include <m4/exit.h>
 #include <m4/xalloc.h>
 #include <m4/xstrndup.h>
 
@@ -148,16 +149,7 @@ BEGIN_C_DECLS
 
 
 
-/* Make sure these are defined.  */
-#ifndef EXIT_FAILURE
-#  define EXIT_SUCCESS 0
-#  define EXIT_FAILURE 1
-#endif
-
-
 #define DELETE(Expr)   ((Expr) = (xfree (Expr), (void *) 0))
-
-extern char *xstrzdup (const char *string, size_t len);
 
 END_C_DECLS
 
Index: gnulib/m4/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/gnulib/m4/Makefile.am,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile.am
--- gnulib/m4/Makefile.am 15 Sep 2003 10:00:02 -0000 1.10
+++ gnulib/m4/Makefile.am 16 Sep 2003 15:02:55 -0000
@@ -37,6 +37,9 @@ MAINTAINERCLEANFILES  = Makefile.in
 # Gnulib Makefile.am snippets #
 # --------------------------- #
 
+## exit (not from gnulib):
+pkginclude_HEADERS += exit.h
+
 ## exitfail:
 libgnu_la_SOURCES += exitfail.c exitfail.h
 
Index: gnulib/m4/exit.h
===================================================================
RCS file: gnulib/m4/exit.h
diff -N gnulib/m4/exit.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/exit.h 16 Sep 2003 15:02:55 -0000
@@ -0,0 +1,32 @@
+/* exit() function.
+   Copyright (C) 1995, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _EXIT_H
+#define _EXIT_H
+
+/* Get exit() declaration.  */
+#include <stdlib.h>
+
+/* Some systems do not define EXIT_*, even with STDC_HEADERS.  */
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+#endif /* _EXIT_H */