1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-05 13:38:33 +00:00

Squashed '3rdparty/toluapp/' changes from e0f18471..1fae7fd2

1fae7fd2 Merge pull request #3 from brndnmtthws/enable-std-c99
a0462958 Don't update homebrew.
d0a259d2 Enable C99, ignore unused value.

git-subtree-dir: 3rdparty/toluapp
git-subtree-split: 1fae7fd29e3cd741ec62b3c2cd1fad22ff435911
This commit is contained in:
Brenden Matthews 2018-12-22 14:01:32 -05:00
parent d54a5aec94
commit 5d71853ec2
2 changed files with 19 additions and 17 deletions

View File

@ -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}

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 */
#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