Update.

	* argp/Makefile (CFLAGS-argp-help.c): Add -fexceptions.
	(CFLAGS-argp-fmtstream.c): Likewise.
	* argp/argp.h: Remove a number of __THROW.

diff --git a/ChangeLog b/ChangeLog
index 82c7f3860b2aa1052696e09f036009eef4083987..3253b754ecedcd73c90cbf239c16222ddd74231a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-08-30  Ulrich Drepper  <drepper@redhat.com>
 
+       * argp/Makefile (CFLAGS-argp-help.c): Add -fexceptions.
+       (CFLAGS-argp-fmtstream.c): Likewise.
+       * argp/argp.h: Remove a number of __THROW.
+
        * misc/sys/syslog.h (vsyslog): Remove __THROW.
 
        * misc/Makefile (CFLAGS-getpass.c): Add -fexceptions.

diff --git a/argp/Makefile b/argp/Makefile
index e5291599e786704ab67d0e9d0cf0e9e044f97d36..d341e570061ad4cb2bf75075331888d658635784 100644 (file)
--- a/argp/Makefile
+++ b/argp/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2002, 2003 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -28,4 +28,7 @@ routines      = $(addprefix argp-, ba fmtstream fs-xinl help parse pv \
 
 tests          = argp-test tst-argp1
 
+CFLAGS-argp-help.c = -fexceptions
+CFLAGS-argp-fmtstream.c = -fexceptions
+
 include ../Rules

diff --git a/argp/argp.h b/argp/argp.h
index 564db5515ad27a7a1eee319fca259103ae348b0c..d2ceea1b8091d1ebbe13ae7fa20d1c987ca76c73 100644 (file)
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -448,10 +448,10 @@ extern error_t argp_err_exit_status;
    ARGP_HELP_*.  */
 extern void argp_help (__const struct argp *__restrict __argp,
                       FILE *__restrict __stream,
-                      unsigned __flags, char *__restrict __name) __THROW;
+                      unsigned __flags, char *__restrict __name);
 extern void __argp_help (__const struct argp *__restrict __argp,
                         FILE *__restrict __stream, unsigned __flags,
-                        char *__name) __THROW;
+                        char *__name);
 \f
 /* The following routines are intended to be called from within an argp
    parsing routine (thus taking an argp_state structure as the first
@@ -465,23 +465,23 @@ extern void __argp_help (__const struct argp *__restrict __argp,
    from the set ARGP_HELP_*.  */
 extern void argp_state_help (__const struct argp_state *__restrict __state,
                             FILE *__restrict __stream,
-                            unsigned int __flags) __THROW;
+                            unsigned int __flags);
 extern void __argp_state_help (__const struct argp_state *__restrict __state,
                               FILE *__restrict __stream,
-                              unsigned int __flags) __THROW;
+                              unsigned int __flags);
 
 /* Possibly output the standard usage message for ARGP to stderr and exit.  */
-extern void argp_usage (__const struct argp_state *__state) __THROW;
-extern void __argp_usage (__const struct argp_state *__state) __THROW;
+extern void argp_usage (__const struct argp_state *__state);
+extern void __argp_usage (__const struct argp_state *__state);
 
 /* If appropriate, print the printf string FMT and following args, preceded
    by the program name and `:', to stderr, and followed by a `Try ... --help'
    message, then exit (1).  */
 extern void argp_error (__const struct argp_state *__restrict __state,
-                       __const char *__restrict __fmt, ...) __THROW
+                       __const char *__restrict __fmt, ...)
      __attribute__ ((__format__ (__printf__, 2, 3)));
 extern void __argp_error (__const struct argp_state *__restrict __state,
-                         __const char *__restrict __fmt, ...) __THROW
+                         __const char *__restrict __fmt, ...)
      __attribute__ ((__format__ (__printf__, 2, 3)));
 
 /* Similar to the standard gnu error-reporting function error(), but will
@@ -494,11 +494,11 @@ extern void __argp_error (__const struct argp_state *__restrict __state,
    parsing but don't reflect a (syntactic) problem with the input.  */
 extern void argp_failure (__const struct argp_state *__restrict __state,
                          int __status, int __errnum,
-                         __const char *__restrict __fmt, ...) __THROW
+                         __const char *__restrict __fmt, ...)
      __attribute__ ((__format__ (__printf__, 4, 5)));
 extern void __argp_failure (__const struct argp_state *__restrict __state,
                            int __status, int __errnum,
-                           __const char *__restrict __fmt, ...) __THROW
+                           __const char *__restrict __fmt, ...)
      __attribute__ ((__format__ (__printf__, 4, 5)));
 
 /* Returns true if the option OPT is a valid short option.  */