Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-19 11:35:12 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Brenden Matthews 2018-12-22 14:01:32 -05:00
commit f18c43ccfb
No known key found for this signature in database
GPG Key ID: 60FBD122E62B0D30
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/toluapp/.travis.yml vendored
View File

@ -73,15 +73,14 @@ matrix:
before_install: before_install:
- | - |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update; HOMEBREW_NO_AUTO_UPDATE=1 brew install lua ccache;
brew install lua ccache;
export PATH="/usr/local/opt/ccache/libexec:$PATH"; export PATH="/usr/local/opt/ccache/libexec:$PATH";
fi fi
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
# Combine global build options with OS/compiler-dependent options # Combine global build options with OS/compiler-dependent options
- export CMAKE_OPTIONS="${CMAKE_OPTIONS} ${ENV_CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" - 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 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: install:
- echo ${PATH} - echo ${PATH}

3
3rdparty/toluapp/src/lib/tolua_map.c vendored
View File

@ -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 */ #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); luaL_loadbuffer(L, B, size, name) || lua_pcall(L, 0, 0, 0);
#pragma GCC diagnostic pop
#else #else
lua_dobuffer(L, B, size, name); lua_dobuffer(L, B, size, name);
#endif #endif