Merge commit '5d71853ec2da0cf37480459dcb1a398e9a1e8a03' into fix-build-with-warnings-enabled

3rdparty/toluapp/.travis.yml

@@ -73,15 +73,14 @@ matrix:
 before_install:
     - |
      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-       brew update;
-       brew install lua ccache;
+       HOMEBREW_NO_AUTO_UPDATE=1 brew install lua ccache;
        export PATH="/usr/local/opt/ccache/libexec:$PATH";
      fi
     - eval "${MATRIX_EVAL}"
     # Combine global build options with OS/compiler-dependent options
     - export CMAKE_OPTIONS="${CMAKE_OPTIONS} ${ENV_CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
     - export CXX_FLAGS="${CXX_FLAGS} ${ENV_CXX_FLAGS} -Wall -Werror -Wextra -Wunused -pedantic"
-    - export C_FLAGS="${C_FLAGS} ${ENV_C_FLAGS} -Wall -Werror -Wextra -Wunused -pedantic"
+    - export C_FLAGS="${C_FLAGS} ${ENV_C_FLAGS} -Wall -Werror -Wextra -Wunused -pedantic -std=c99"
 
 install:
     - echo ${PATH}

3rdparty/toluapp/src/lib/tolua_map.c

@@ -749,7 +749,10 @@ TOLUA_API void tolua_dobuffer(lua_State *L, char *B, unsigned int size, const ch
 {
 
 #ifdef LUA_VERSION_NUM /* lua 5.1 */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-value"
 	luaL_loadbuffer(L, B, size, name) || lua_pcall(L, 0, 0, 0);
+#pragma GCC diagnostic pop
 #else
 	lua_dobuffer(L, B, size, name);
 #endif