From 5c0e97ee7c28eb259183605bd7675babd067ee5c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 16 Mar 2007 00:52:55 +0000 Subject: [PATCH] Try to avoid clashing symbols. --- ChangeLog | 5 +++++ lib/dummy.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d35557e13..26a3f3a17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-03-15 Bruno Haible + * lib/dummy.c (gl_dummy_symbol): Renamed from 'dummy'. + Reported by James Youngman . + +2007-03-15 Bruno Haible + * 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. */ -- 2.11.0