Fixed compiler warning and created make variable to contain compiler option to export dynamic symbols from executable to shared libraries

3 files changed, 5 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index ec7d96a5..a634446c 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,11 @@ ifeq ($(OPSYS),Darwin)
 LIBS=-lpthread
 RANLIB=ranlib $@
 else
+EXPORT_DYNAMIC=-rdynamic
 LIBS=-lpthread -lssl -lrt
 
 ifdef PATH_Plugins
-CFLAGS += -rdynamic -DPATH_Plugins="$(PATH_Plugins)"
+CFLAGS += $(EXPORT_DYNAMIC) -DPATH_Plugins="$(PATH_Plugins)"
 LIBS += -ldl
 endif
 
@@ -66,7 +67,7 @@ $(BINDIR)/client: $(BINDIR)/main_client.o $(BINDIR)/libtcf.a
 	$(CC) $(CFLAGS) -o $@ $(BINDIR)/main_client.o $(BINDIR)/libtcf.a $(LIBS)
 
 $(BINDIR)/tcflua: $(BINDIR)/main_lua.o $(BINDIR)/libtcf.a
-	$(CC) $(CFLAGS) -Wl,-E -o $@ $(BINDIR)/main_lua.o $(BINDIR)/libtcf.a $(LIBS) $(LUADIR)/lib/liblua.a -lm -ldl
+	$(CC) $(CFLAGS) $(EXPORT_DYNAMIC) -o $@ $(BINDIR)/main_lua.o $(BINDIR)/libtcf.a $(LIBS) $(LUADIR)/lib/liblua.a -lm -ldl
 
 $(BINDIR)/tcfreg: $(BINDIR)/main_reg.o $(BINDIR)/libtcf.a
 	$(CC) $(CFLAGS) -o $@ $(BINDIR)/main_reg.o $(BINDIR)/libtcf.a $(LIBS)
diff --git a/peer.c b/peer.c
index 81963e3d..4ed7c6e9 100644
--- a/peer.c
+++ b/peer.c
@@ -135,7 +135,7 @@ void peer_server_addprop(PeerServer * s, char * name, char * value) {
     s->ind++;
 }
 
-char * peer_server_getprop(PeerServer * s, char * name, char * default_value) {
+char * peer_server_getprop(PeerServer * s, const char * name, char * default_value) {
     int i;
 
     for (i = 0; i < s->ind; i++) {
diff --git a/peer.h b/peer.h
index 2d3d5c5a..be141bf6 100644
--- a/peer.h
+++ b/peer.h
@@ -59,7 +59,7 @@ extern PeerServer * peer_server_alloc(void);
 extern void peer_server_addprop(PeerServer * ps, char * name, char * value);
 
 /* Add properties to peer server object */
-extern char * peer_server_getprop(PeerServer * ps, char * name, char * default_value);
+extern char * peer_server_getprop(PeerServer * ps, const char * name, char * default_value);
 
 /* Free peer server object */
 extern void peer_server_free(PeerServer * ps);