Author: mikej Date: Wed Mar 11 15:51:44 2009 New Revision: 12573 Log: fix build failures Modified: freeswitch/trunk/libs/esl/Makefile freeswitch/trunk/libs/esl/perl/Makefile freeswitch/trunk/libs/esl/php/Makefile freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Wed Mar 11 15:51:44 2009 @@ -5,7 +5,7 @@ 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. Modified: freeswitch/trunk/libs/esl/perl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/perl/Makefile (original) +++ freeswitch/trunk/libs/esl/perl/Makefile Wed Mar 11 15:51:44 2009 @@ -3,7 +3,7 @@ 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 @@ $(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) Modified: freeswitch/trunk/libs/esl/php/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/php/Makefile (original) +++ freeswitch/trunk/libs/esl/php/Makefile Wed Mar 11 15:51:44 2009 @@ -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 @@ 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) Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Wed Mar 11 15:51:44 2009 @@ -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)