diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/util.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index fb3ba51..882af74 100644 --- a/configure.ac +++ b/configure.ac @@ -27,10 +27,8 @@ AC_ARG_ENABLE(debug, [debug="$enableval"]) if test "$debug" = "yes"; then CFLAGS="-O0 -g -DDEBUG" - CXXFLAGS="$CFLAGS" else CFLAGS="$CFLAGS -DNDEBUG" - CXXFLAGS="$CXXFLAGS -DNDEBUG" fi # Check for strict flag @@ -39,12 +37,10 @@ AC_ARG_ENABLE(strict, [AS_HELP_STRING(--enable-strict, [Enable strict compiler warnings and errors (false)])], [strict="$enableval"]) if test "$strict" = "yes"; then - CFLAGS="$CFLAGS -std=c99 -pedantic -Wall -Wconversion -Winit-self" - CXXFLAGS="$CXXFLAGS -ansi -pedantic -Wall -Wconversion -Winit-self -Woverloaded-virtual -Wsign-promo" + CFLAGS="$CFLAGS -std=c99 -pedantic -Wall -Wextra -Wconversion -Winit-self" fi # Bolt on a few specific flags to CXXFLAGS that should always be used -#CXXFLAGS="$CXXFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line" #CFLAGS="$CFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line" # Check plugin install directory @@ -67,8 +67,8 @@ vstrjoin(const uchar* first, va_list args_list) // FIXME: this is horribly, awfully, disgracefully slow. // so I'm lazy. - uchar* arg = NULL; - uchar* result = ustrdup(first); + const uchar* arg = NULL; + uchar* result = ustrdup(first); while ((arg = va_arg(args_list, const uchar*)) != NULL) ustrappend(&result, arg); |