Update from glibc.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ea42767d27718b0605c6b6d051b2e700d7e7f15e..ccf79f68907dacbda6e7f1f4b3bc0a778b4ae8c3 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * argp-fs-xinl.c, argp-xinl.c: Update from glibc.
+
 2004-10-12  Simon Josefsson  <jas@extundo.com>
 
        * getpass.c (fflush_unlocked, flockfile, funlockfile)
@@ -38,7 +42,7 @@
 
        * regex.c (re_comp): Cast gettext return value to char *,
        Problem reported by Martin Neitzel via Mark D. Baushke.
-       
+
 2004-10-04  Simon Josefsson  <jas@extundo.com>
 
        * error.c, md5.c, regex.c: Use '#if USE_UNLOCKED_IO' instead of

diff --git a/lib/argp-fs-xinl.c b/lib/argp-fs-xinl.c
index 32015e95bb31c9c837c07af260e02124b95c33c6..a4d14a2e58c5954f03a9901795130ec1b1c3f058 100644 (file)
--- a/lib/argp-fs-xinl.c
+++ b/lib/argp-fs-xinl.c
@@ -1,5 +1,5 @@
 /* Real definitions for extern inline functions in argp-fmtstream.h
-   Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -23,7 +23,7 @@
 
 #define ARGP_FS_EI
 #undef __OPTIMIZE__
-#define __OPTIMIZE__
+#define __OPTIMIZE__ 1
 #include "argp-fmtstream.h"
 
 #if 0

diff --git a/lib/argp-xinl.c b/lib/argp-xinl.c
index a59b9f32a566ee84cb6cc5f8219f41c2002e72b2..51d3e20c82376406ee57e546db349f2a56d51e32 100644 (file)
--- a/lib/argp-xinl.c
+++ b/lib/argp-xinl.c
@@ -1,5 +1,5 @@
 /* Real definitions for extern inline functions in argp.h
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -30,7 +30,7 @@
 #endif
 #define ARGP_EI
 #undef __OPTIMIZE__
-#define __OPTIMIZE__
+#define __OPTIMIZE__ 1
 #include "argp.h"
 
 /* Add weak aliases.  */