From fc76a4fa7ef0e8b30ea08d86da977382d249b878 Mon Sep 17 00:00:00 2001 From: bel Date: Fri, 3 Jul 2015 23:11:20 +0200 Subject: [PATCH] Fix some warnings in Linux --- src/civetweb.c | 3 ++- src/main.c | 2 +- src/mod_lua.inl | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/civetweb.c b/src/civetweb.c index e30e7087..9602f3c2 100755 --- a/src/civetweb.c +++ b/src/civetweb.c @@ -1149,6 +1149,7 @@ typedef struct tagTHREADNAME_INFO { #pragma pack(pop) #elif defined(__linux__) #include +#include #endif #if ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12))) @@ -5245,7 +5246,7 @@ static void send_file_data(struct mg_connection *conn, mg_write(conn, filep->membuf + offset, (size_t)len); } else if (len > 0 && filep->fp != NULL) { /* file stored on disk */ -#if defined(LINUX) +#if defined(__linux__) /* TODO (high): Test sendfile for Linux */ if (conn->throttle == 0 && conn->ssl == 0) { off_t sf_offs = (off_t)offset; diff --git a/src/main.c b/src/main.c index 49b348df..ade122dd 100644 --- a/src/main.c +++ b/src/main.c @@ -127,7 +127,7 @@ static struct tuser_data #endif /* backup config file */ -#if !defined(CONFIG_FILE2) && defined(LINUX) +#if !defined(CONFIG_FILE2) && defined(__linux__) #define CONFIG_FILE2 "/usr/local/etc/civetweb.conf" #endif diff --git a/src/mod_lua.inl b/src/mod_lua.inl index 03fc45da..b934941d 100644 --- a/src/mod_lua.inl +++ b/src/mod_lua.inl @@ -1572,6 +1572,8 @@ static void lua_websocket_close(struct mg_connection *conn, void *ws_arg) /* TODO: Delete lua_websock_data and remove it from the websocket list. This must only be done, when all connections are closed, and all asynchronous operations and timers are completed/expired. */ + (void)shared_websock_list; /* shared_websock_list unused (see open TODO) */ + (void)pthread_mutex_unlock(&ws->ws_mutex); } #endif