From d46b48eadd35843b7237503cb77293a1654e00e8 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 11 Nov 2004 20:30:14 +0000
Subject: [PATCH] * getopt_.h: rename getopt to __GETOPT_PREFIX##getopt, and so
 forth

---
 lib/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 021dabb17d..64c362f812 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* getopt_.h [defined __GETOPT_PREFIX && !defined __need_getopt]:
+	Include <unistd.h> if available.
+	Then rename getopt to __GETOPT_PREFIX##getopt, and so forth for
+	the other external symbols.
+	(getopt) [!defined __GNU_LIBRARY]: Use prototype, not old-style
+	declaration, since the above renaming now works around collisions.
+
 2004-11-11  Jim Meyering  <jim@meyering.net>
 
 	* linebreak.c: Remove trailing blanks.
-- 
2.30.2