diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/base.h | 4 | ||||
| -rw-r--r-- | src/configfile.c | 6 | ||||
| -rw-r--r-- | src/connections-glue.c | 1 | ||||
| -rw-r--r-- | src/http-header-glue.c | 1 | ||||
| -rw-r--r-- | src/lempar.c | 6 | ||||
| -rw-r--r-- | src/mod_evasive.c | 2 | ||||
| -rw-r--r-- | src/mod_webdav.c | 2 |
8 files changed, 14 insertions, 9 deletions
@@ -12,6 +12,7 @@ NEWS * Fix segfault in mod_scgi (fixes #1911) * Treat EPIPE as connection-closed error in network_freebsd_sendfile.c (another fix from #1913) * Fix useless redirection of stderr in mod_rrdtool, as it gets redirected to /dev/null later. (fixes #1922) + * Fix some problems with more strict compilers (#1923) - 1.4.21 - 2009-02-16 @@ -492,9 +492,9 @@ typedef struct { enum { STAT_CACHE_ENGINE_UNSET, STAT_CACHE_ENGINE_NONE, - STAT_CACHE_ENGINE_SIMPLE, + STAT_CACHE_ENGINE_SIMPLE #ifdef HAVE_FAM_H - STAT_CACHE_ENGINE_FAM + , STAT_CACHE_ENGINE_FAM #endif } stat_cache_engine; unsigned short enable_cores; diff --git a/src/configfile.c b/src/configfile.c index cc15fd54..e45db852 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -1006,13 +1006,11 @@ int config_read(server *srv, const char *fn) { context_init(srv, &context); context.all_configs = srv->config_context; - pos = strrchr(fn, #ifdef __WIN32 - '\\' + pos = strrchr(fn, '\\'); #else - '/' + pos = strrchr(fn, '/'); #endif - ); if (pos) { buffer_copy_string_len(context.basedir, fn, pos - fn + 1); fn = pos + 1; diff --git a/src/connections-glue.c b/src/connections-glue.c index 89180b4e..5ef7a1e0 100644 --- a/src/connections-glue.c +++ b/src/connections-glue.c @@ -1,4 +1,5 @@ #include "base.h" +#include "connections.h" const char *connection_get_state(connection_state_t state) { switch (state) { diff --git a/src/http-header-glue.c b/src/http-header-glue.c index 909c05fb..5aa6a230 100644 --- a/src/http-header-glue.c +++ b/src/http-header-glue.c @@ -9,6 +9,7 @@ #include "buffer.h" #include "log.h" #include "etag.h" +#include "response.h" /* * This was 'borrowed' from tcpdump. diff --git a/src/lempar.c b/src/lempar.c index 3b2edcf5..26708ea7 100644 --- a/src/lempar.c +++ b/src/lempar.c @@ -180,12 +180,14 @@ static char *yyTracePrompt = 0; ** Outputs: ** None. */ +#if 0 void ParseTrace(FILE *TraceFILE, char *zTracePrompt){ yyTraceFILE = TraceFILE; yyTracePrompt = zTracePrompt; if( yyTraceFILE==0 ) yyTracePrompt = 0; else if( yyTracePrompt==0 ) yyTraceFILE = 0; } +#endif #endif /* NDEBUG */ #ifndef NDEBUG @@ -208,6 +210,7 @@ static const char *yyRuleName[] = { ** This function returns the symbolic name associated with a token ** value. */ +#if 0 const char *ParseTokenName(int tokenType){ #ifndef NDEBUG if( tokenType>0 && (size_t)tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){ @@ -219,6 +222,7 @@ const char *ParseTokenName(int tokenType){ return ""; #endif } +#endif /* ** This function allocates a new parser. @@ -511,9 +515,9 @@ static void yy_syntax_error( int yymajor, /* The major type of the error token */ YYMINORTYPE yyminor /* The minor type of the error token */ ){ + ParseARG_FETCH; UNUSED(yymajor); UNUSED(yyminor); - ParseARG_FETCH; #define TOKEN (yyminor.yy0) %% ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ diff --git a/src/mod_evasive.c b/src/mod_evasive.c index b247f0af..29707113 100644 --- a/src/mod_evasive.c +++ b/src/mod_evasive.c @@ -144,7 +144,7 @@ URIHANDLER_FUNC(mod_evasive_uri_handler) { case AF_INET6: #endif break; - default: // Address family not supported + default: /* Address family not supported */ return HANDLER_GO_ON; }; diff --git a/src/mod_webdav.c b/src/mod_webdav.c index 38af8352..a2376c01 100644 --- a/src/mod_webdav.c +++ b/src/mod_webdav.c @@ -1160,8 +1160,8 @@ int webdav_has_lock(server *srv, connection *con, plugin_data *p, buffer *uri) { int has_lock = 1; #ifdef USE_LOCKS - UNUSED(srv); data_string *ds; + UNUSED(srv); /** * This implementation is more fake than real |