Hello,
symbols with leading _ should be reserved to the compiler/libc, even more
so with leading __, and even more so with simple names like STATIC. The
simple patch attached rename __STATIC everywhere to ELEKTRA_STATIC.
They are many other symbols with a leading _, more or less all the private
symbols, feel free to correct that too, or add a leading _elektra for those
symbols. It is not that much an issue since it is common practice to have
one leading _ for internal symbols, even if it goes against the standard, but
a double __ is calling for trouble.
--
Pat
Index: src/libregistry/Makefile.am
===================================================================
--- src/libregistry/Makefile.am (révision 848)
+++ src/libregistry/Makefile.am (copie de travail)
@@ -9,7 +9,7 @@
# lib_LIBRARIES = libregistry.a
# libregistry_a_SOURCES = registrystub.c ../include/kdb.h
-# libregistry_a_CFLAGS = -D__STATIC -D__STATIC -DDEFAULT_BACKEND=\"@[EMAIL
PROTECTED]"
+# libregistry_a_CFLAGS = -DELEKTRA_STATIC -DDEFAULT_BACKEND=\"@[EMAIL
PROTECTED]"
# libregistry_a_LIBADD = ../libelektra/libelektra_a-libkdb.o \
# ../libelektra/libelektra_a-key.o \
# ../libelektra/libelektra_a-keyset.o \
Index: src/kdb/Makefile.am
===================================================================
--- src/kdb/Makefile.am (révision 848)
+++ src/kdb/Makefile.am (copie de travail)
@@ -9,5 +9,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LTDLINCL)
kdb_static_SOURCES = kdb.c help.c ../include/kdb.h
-kdb_static_CFLAGS = -D__STATIC -Wall
+kdb_static_CFLAGS = -DELEKTRA_STATIC -Wall
kdb_static_LDADD = ../libelektra/libelektra.a
Index: src/include/kdbLibLoader.h
===================================================================
--- src/include/kdbLibLoader.h (révision 848)
+++ src/include/kdbLibLoader.h (copie de travail)
@@ -23,7 +23,7 @@
} kdblib_symbol;
-#ifdef __STATIC
+#ifdef ELEKTRA_STATIC
#define kdbLibInit() 0
Index: src/include/kdbbackend.h
===================================================================
--- src/include/kdbbackend.h (révision 848)
+++ src/include/kdbbackend.h (copie de travail)
@@ -29,7 +29,7 @@
#include <kdb.h>
#include <kdbprivate.h>
-#ifdef __STATIC
+#ifdef ELEKTRA_STATIC
#define KDBEXPORT(module) KDBBackend
*libelektra_##module##_LTX_kdbBackendFactory(void)
#else
#define KDBEXPORT(module) KDBBackend *kdbBackendFactory(void)
Index: src/backends/ini/Makefile.am
===================================================================
--- src/backends/ini/Makefile.am (révision 848)
+++ src/backends/ini/Makefile.am (copie de travail)
@@ -4,7 +4,7 @@
lib_LIBRARIES = libelektra-ini.a
libelektra_ini_a_SOURCES = ini.c helpers.c parser.c ini.h ../../include/kdb.h
../../include/kdbbackend.h
-libelektra_ini_a_CFLAGS = -DDEBUG -D_POSIX_SOURCE -D_BSD_SOURCE -D__STATIC
-ansi -pedantic -Wall
+libelektra_ini_a_CFLAGS = -DDEBUG -D_POSIX_SOURCE -D_BSD_SOURCE
-DELEKTRA_STATIC -ansi -pedantic -Wall
libelektra_ini_a_LIBADD = ../../libelektra/libelektra.la
backend_LTLIBRARIES = libelektra-ini.la
Index: src/backends/filesys/Makefile.am
===================================================================
--- src/backends/filesys/Makefile.am (révision 848)
+++ src/backends/filesys/Makefile.am (copie de travail)
@@ -3,7 +3,7 @@
lib_LIBRARIES = libelektra-filesys.a
libelektra_filesys_a_SOURCES = filesys.c ../../include/kdb.h
../../include/kdbbackend.h
-libelektra_filesys_a_CFLAGS = -D__STATIC -Wall
+libelektra_filesys_a_CFLAGS = -DELEKTRA_STATIC -Wall
libelektra_filesys_a_LIBADD = ../../libelektra/libelektra.la
Index: src/libloader/kdbLibLoader.c
===================================================================
--- src/libloader/kdbLibLoader.c (révision 848)
+++ src/libloader/kdbLibLoader.c (copie de travail)
@@ -31,7 +31,7 @@
#include "kdbbackend.h"
#include "kdbLibLoader.h"
-#ifdef __STATIC
+#ifdef ELEKTRA_STATIC
/* Static case */
extern kdblib_symbol kdb_exported_syms[];
Index: src/libloader/Makefile.am
===================================================================
--- src/libloader/Makefile.am (révision 848)
+++ src/libloader/Makefile.am (copie de travail)
@@ -5,7 +5,7 @@
noinst_LIBRARIES = libloader-static.a
libloader_static_a_SOURCES = kdbLibLoader.c ../include/kdbLibLoader.h
-libloader_static_a_CFLAGS = -D__STATIC -Wall
+libloader_static_a_CFLAGS = -DELEKTRA_STATIC -Wall
noinst_LTLIBRARIES = libloader-dynamic.la
Index: src/libelektra/backend_symbols.c
===================================================================
--- src/libelektra/backend_symbols.c (révision 848)
+++ src/libelektra/backend_symbols.c (copie de travail)
@@ -4,7 +4,7 @@
#include "kdbbackend.h"
#include "kdbLibLoader.h"
-#ifdef __STATIC
+#ifdef ELEKTRA_STATIC
/* Make the compiler happy */
extern int libelektra_filesys_LTX_kdbBackendFactory;
Index: src/libelektra/Makefile.am
===================================================================
--- src/libelektra/Makefile.am (révision 848)
+++ src/libelektra/Makefile.am (copie de travail)
@@ -8,7 +8,7 @@
../include/kdbbackend.h \
../include/kdbprivate.h \
../include/kdbLibLoader.h
-libelektra_a_CFLAGS = -D__STATIC -DDEFAULT_BACKEND=\"$(default_backend)\"
-ansi -pedantic -Wall
+libelektra_a_CFLAGS = -DELEKTRA_STATIC
-DDEFAULT_BACKEND=\"$(default_backend)\" -ansi -pedantic -Wall
libelektra_a_LIBADD = ../libloader/libloader_static_a-kdbLibLoader.$(OBJEXT) \
../backends/$(default_backend)/libelektra_$(default_backend)_a-$(default_backend).$(OBJEXT)
\
$(LIBICONV)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Registry-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/registry-list
