From: Bruno Haible <bruno@clisp.org>
Date: Fri, 16 Mar 2007 00:52:55 +0000 (+0000)
Subject: Try to avoid clashing symbols.
X-Git-Tag: cvs-readonly~778
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=5c0e97ee7c28eb259183605bd7675babd067ee5c;p=gnulib.git

Try to avoid clashing symbols.
---

diff --git a/ChangeLog b/ChangeLog
index d35557e13..26a3f3a17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-15  Bruno Haible  <bruno@clisp.org>
 
+	* lib/dummy.c (gl_dummy_symbol): Renamed from 'dummy'.
+	Reported by James Youngman <jay@gnu.org>.
+
+2007-03-15  Bruno Haible  <bruno@clisp.org>
+
 	* lib/glob.c (glob): Add 'restrict' so that prototype matches the
 	declared prototype. Needed with cc on OSF/1 5.1.
 
diff --git a/lib/dummy.c b/lib/dummy.c
index dccb0ad6c..4db0febd6 100644
--- a/lib/dummy.c
+++ b/lib/dummy.c
@@ -36,7 +36,7 @@
 
 #ifdef __sun
 /* This declaration ensures that the library will export at least 1 symbol.  */
-int dummy;
+int gl_dummy_symbol;
 #else
 /* This declaration is solely to ensure that after preprocessing
    this file is never empty.  */