Commit 08ff74f6 authored by Simon Morlat's avatar Simon Morlat

repair compilation for linux

parent 1eaeb178
...@@ -194,10 +194,10 @@ else() ...@@ -194,10 +194,10 @@ else()
endif() endif()
if(ENABLE_STRICT) if(ENABLE_STRICT)
list(APPEND STRICT_OPTIONS_CPP "-Werror" "-Wextra" "-Wno-unused-parameter" "-Wno-error=unknown-pragmas" "-Wuninitialized" "-fno-strict-aliasing") list(APPEND STRICT_OPTIONS_CPP "-Werror" "-Wextra" "-Wno-unused-parameter" "-Wno-error=unknown-pragmas" "-Wuninitialized" "-fno-strict-aliasing")
list(APPEND STRICT_OPTIONS_C "-Wdeclaration-after-statement" "-Wstrict-prototypes") list(APPEND STRICT_OPTIONS_C "-Wdeclaration-after-statement" "-Wstrict-prototypes -Wno-missing-field-initializers")
endif() endif()
# this warning is generated by antlr so ignore it for now # this warning is generated by antlr so ignore it for now
list(APPEND STRICT_OPTIONS_C "-Wno-strict-prototypes") list(APPEND STRICT_OPTIONS_C "-Wno-strict-prototypes" "-Wno-error=sign-compare")
endif() endif()
if(STRICT_OPTIONS_CPP) if(STRICT_OPTIONS_CPP)
list(REMOVE_DUPLICATES STRICT_OPTIONS_CPP) list(REMOVE_DUPLICATES STRICT_OPTIONS_CPP)
......
...@@ -128,15 +128,12 @@ case "$target_os" in ...@@ -128,15 +128,12 @@ case "$target_os" in
esac esac
if test "$strict" = "true"; then if test "$strict" = "true"; then
STRICT_OPTIONS="$STRICT_OPTIONS -Werror -Wextra -Wno-unused-parameter -Wno-error=unknown-pragmas -Wuninitialized -Wno-error=strict-prototypes" STRICT_OPTIONS="$STRICT_OPTIONS -Werror -Wextra -Wno-unused-parameter -Wno-error=unknown-pragmas -Wuninitialized -Wno-error=strict-prototypes -Wno-missing-field-initializers"
fi fi
dnl because of antlr3 we must accept a few warnings... dnl because of antlr3 we must accept a few warnings...
dnl more portable for the moment dnl more portable for the moment
LESS_STRICT_OPTIONS= LESS_STRICT_OPTIONS="-Wno-error=sign-compare"
dnl LESS_STRICT_OPTIONS="$STRICT_OPTIONS -Wno-error=unused-function \
dnl -Wno-error=uninitialized -Wno-error=unused-variable \
dnl -Wno-error=unused-but-set-variable "
AC_SUBST(STRICT_OPTIONS) AC_SUBST(STRICT_OPTIONS)
AC_SUBST(STRICT_OPTIONS_CC) AC_SUBST(STRICT_OPTIONS_CC)
......
noinst_LTLIBRARIES=libbellesip_generated.la noinst_LTLIBRARIES=libbellesip_generated.la
libbellesip_generated_la_CFLAGS=$(LIBBELLESIP_CFLAGS) $(ANTLR_CFLAGS) $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) libbellesip_generated_la_CFLAGS=$(LIBBELLESIP_CFLAGS) $(ANTLR_CFLAGS) $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) $(LESS_STRICT_OPTIONS)
nodist_libbellesip_generated_la_SOURCES= \ nodist_libbellesip_generated_la_SOURCES= \
......
...@@ -97,7 +97,7 @@ static int client_transaction_on_call_repair_timer(belle_sip_transaction_t *t) { ...@@ -97,7 +97,7 @@ static int client_transaction_on_call_repair_timer(belle_sip_transaction_t *t) {
static void on_channel_state_changed(belle_sip_channel_listener_t *l, belle_sip_channel_t *chan, belle_sip_channel_state_t state){ static void on_channel_state_changed(belle_sip_channel_listener_t *l, belle_sip_channel_t *chan, belle_sip_channel_state_t state){
belle_sip_transaction_t *t=(belle_sip_transaction_t*)l; belle_sip_transaction_t *t=(belle_sip_transaction_t*)l;
belle_sip_io_error_event_t ev; belle_sip_io_error_event_t ev;
const belle_sip_timer_config_t *timercfg; const belle_sip_timer_config_t *timercfg = NULL;
belle_sip_transaction_state_t tr_state=belle_sip_transaction_get_state((belle_sip_transaction_t*)t); belle_sip_transaction_state_t tr_state=belle_sip_transaction_get_state((belle_sip_transaction_t*)t);
belle_sip_message("transaction [%p] channel state changed to [%s]" belle_sip_message("transaction [%p] channel state changed to [%s]"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment