* getopt_.h: Use __CONCAT rather than ## directly.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1cce5054bf55b8559d4935dd0484a80ea63635f8..d76e07c2b082fd94f5d4bf293f3539959ca96124 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * getopt_.h (__CONCAT): New macro.
+       (getopt, getopt_long, getopt_long_only, optarg, opterr, optind,
+       optopt): Use it instead of invoking ## directly; otherwise, the
+       symbols will be __GETOPT_PREFIXgetopt rather than rpl_getopt.
+
 2004-11-19  Bruno Haible  <bruno@clisp.org>
 
        * strtok_r.c: Move comments from here...