diff options
| author | cbdev <cb@cbcdn.com> | 2019-08-22 22:41:28 +0200 |
|---|---|---|
| committer | cbdev <cb@cbcdn.com> | 2019-08-22 22:41:28 +0200 |
| commit | 93de82b8ccab8fdbeaa2b1847c75488a03340bcc (patch) | |
| tree | c0aa9322a25453f6553c22532529ab3ed44382d3 | |
| parent | 6464a418f2bf13c8c04b10abf5ebdc4c95aae861 (diff) | |
| download | midimonster-93de82b8ccab8fdbeaa2b1847c75488a03340bcc.tar.gz midimonster-93de82b8ccab8fdbeaa2b1847c75488a03340bcc.tar.bz2 midimonster-93de82b8ccab8fdbeaa2b1847c75488a03340bcc.zip | |
Update travis config for openssl, using CFLAGS this time
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | backends/lua.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9f2034c..864c628 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,7 +165,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl; fi # OpenSSL is not a proper install due to some Apple bull, so provide additional locations via the environment... - - export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include" + - export CFLAGS="$CFLAGS -I/usr/local/opt/openssl/include" - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too #Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that diff --git a/backends/lua.c b/backends/lua.c index ec02575..365cf3e 100644 --- a/backends/lua.c +++ b/backends/lua.c @@ -384,11 +384,11 @@ static int lua_set(instance* inst, size_t num, channel** c, channel_value* v){ } static int lua_handle(size_t num, managed_fd* fds){ - uint8_t read_buffer[100]; uint64_t delta = timer_interval; size_t n; #ifdef MMBACKEND_LUA_TIMERFD + uint8_t read_buffer[100]; if(!num){ return 0; } |