* getopt_.h: rename getopt to __GETOPT_PREFIX##getopt, and so forth

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 021dabb17d4d64fa34bd90c1e25c75b2389a3814..64c362f812ca299e15eec5677e32d62f713cbb92 100644 (file)
--- 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.