fix build failures

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12573 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/esl/Makefile b/libs/esl/Makefile
index b9d9c2e07add99cbfd6895c981744fe5ff45e1e3..4745b42dc5978de76038852ee160a46375237124 100644 (file)
--- a/libs/esl/Makefile
+++ b/libs/esl/Makefile
@@ -5,7 +5,7 @@ DEBUG=-g -ggdb
 BASE_FLAGS=$(INCS) -DHAVE_EDITLINE $(DEBUG) -I$(LIBEDIT_DIR)/src/ -fPIC
 PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS=$(BASE_FLAGS) $(PICKY)
-CXXFLAGS=$(BASE_FLAGS) -Wall -Werror
+CXXFLAGS=$(BASE_FLAGS) -Wall -Werror -Wno-unused-variable
 MYLIB=libesl.a
 LIBS=-lncurses -lpthread -lesl
 LDFLAGS=-L.

diff --git a/libs/esl/perl/Makefile b/libs/esl/perl/Makefile
index f71a76b50dc1509d63bbe5ffbb99ae75f5fda1da..50c9c074f53317a5f059f2b3370d9a9d29346c10 100644 (file)
--- a/libs/esl/perl/Makefile
+++ b/libs/esl/perl/Makefile
@@ -3,7 +3,7 @@ PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE
 PERL_LIBS   =$(shell perl -MConfig -e 'print $$Config{libs}')
 LOCAL_CFLAGS= -w -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL
 LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}')
-
+PERL_INC=$(shell $(PERL) -MExtUtils::Embed -e perl_inc)
 all: ESL.so
 
 esl_wrap.cpp:
@@ -16,7 +16,7 @@ perlxsi.o: perlxsi.c
        $(CC) $(CC_CFLAGS) $(CFLAGS) $(LOCAL_CFLAGS) -c perlxsi.c -o perlxsi.o
 
 esl_wrap.o: esl_wrap.cpp
-       $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o
+       $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(PERL_INC) -c esl_wrap.cpp -o esl_wrap.o
 
 ESL.so: esl_wrap.o perlxsi.o
        $(CXX) $(SOLINK) esl_wrap.o perlxsi.o $(MYLIB) $(LOCAL_LDFLAGS) -o ESL.so -L. $(LIBS)

diff --git a/libs/esl/php/Makefile b/libs/esl/php/Makefile
index f98b6863d01ef05f2011246a9f1ac57ce0b1130e..5e1f41a16b5bc60ac5ed5ab62ca5be7f1962b01b 100644 (file)
--- a/libs/esl/php/Makefile
+++ b/libs/esl/php/Makefile
@@ -1,5 +1,6 @@
 LOCAL_CFLAGS=$(shell php-config --includes)
 LOCAL_LDFLAGS=$(shell php-config --ldflags --libs)
+WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function
 
 all: ESL.so
 
@@ -7,7 +8,7 @@ esl_wrap.cpp:
        swig -module ESL -php5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
-       $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o
+       $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o
 
 ESL.so: esl_wrap.o
        $(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o ESL.so -L. $(LIBS)

diff --git a/libs/esl/src/include/esl_oop.h b/libs/esl/src/include/esl_oop.h
index 11bce4a5cc09f24b13a61461d22b9e50bba641c4..b9c2793264dc6a35d7f18c04c03ca71fa602dcd3 100644 (file)
--- a/libs/esl/src/include/esl_oop.h
+++ b/libs/esl/src/include/esl_oop.h
@@ -33,12 +33,9 @@
 
 #ifndef _ESL_OOP_H_
 #define _ESL_OOP_H_
-#ifndef EXTERN_C
-#define EXTERN_C extern "C" {
-#endif
 #include <esl.h>
 #ifdef __cplusplus
-EXTERN_C
+extern "C" { 
 #endif
 
 #define this_check(x) do { if (!this) { esl_log(ESL_LOG_ERROR, "object is not initalized\n"); return x;}} while(0)