From 2349f557002120404ac8b0adf2935e25c615e774 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Mon, 16 May 2005 18:02:47 +0000
Subject: [PATCH] merge from gcc

---
 libiberty/ChangeLog | 8 ++++++++
 libiberty/getopt1.c | 6 +++---
 libiberty/getpwd.c  | 6 ++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 794e147048..9b5a09475a 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-16  Andreas Jaeger  <aj@suse.de>
+
+	* getpwd.c: Remove unneeded prototype getcwd and move getwd so
+	that it's only declared if needed.
+
+	* getopt1.c: Change order of includes so that __GNU_LIBRARY__ is
+	defined.
+
 2005-05-15  Andreas Jaeger  <aj@suse.de>
 
 	* functions.texi: Regenerated.
diff --git a/libiberty/getopt1.c b/libiberty/getopt1.c
index 6fc75a62ab..255b144563 100644
--- a/libiberty/getopt1.c
+++ b/libiberty/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2005
      Free Software Foundation, Inc.
 
    NOTE: This source is derived from an old version taken from the GNU C
@@ -24,8 +24,6 @@
 #include <config.h>
 #endif
 
-#include "getopt.h"
-
 #if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
@@ -36,6 +34,8 @@
 
 #include <stdio.h>
 
+#include "getopt.h"
+
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
    Library, but also included in many other GNU distributions.  Compiling
diff --git a/libiberty/getpwd.c b/libiberty/getpwd.c
index e57ef47e94..c7880d7044 100644
--- a/libiberty/getpwd.c
+++ b/libiberty/getpwd.c
@@ -39,10 +39,6 @@ extern int errno;
 #include <limits.h>
 #endif
 
-/* Prototype these in case the system headers don't provide them. */
-extern char *getpwd ();
-extern char *getwd ();
-
 #include "libiberty.h"
 
 /* Virtually every UN*X system now in common use (except for pre-4.3-tahoe
@@ -50,6 +46,8 @@ extern char *getwd ();
    the few exceptions to the general rule here.  */
 
 #if !defined(HAVE_GETCWD) && defined(HAVE_GETWD)
+/* Prototype in case the system headers doesn't provide it. */
+extern char *getwd ();
 #define getcwd(buf,len) getwd(buf)
 #endif