From 867b733a0456cb12b9e47215b37a5bf252f4f661 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 5 Nov 2015 21:48:13 -0500 Subject: [PATCH] Fix a few GCC warnings on Linux (GCC 4.6) --- depends/protobuf/CMakeLists.txt | 2 +- library/Hooks-linux.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt index ffad350ed..b175b7744 100644 --- a/depends/protobuf/CMakeLists.txt +++ b/depends/protobuf/CMakeLists.txt @@ -201,7 +201,7 @@ google/protobuf/compiler/zip_writer.cc LIST(APPEND LIBPROTOBUF_FULL_SRCS ${LIBPROTOBUF_LITE_SRCS}) IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-sign-compare") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-sign-compare -Wno-unused-result") ENDIF() INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/library/Hooks-linux.cpp b/library/Hooks-linux.cpp index 31c0323f6..b0bf5a781 100644 --- a/library/Hooks-linux.cpp +++ b/library/Hooks-linux.cpp @@ -114,7 +114,8 @@ static int (*_SDL_Init)(uint32_t flags) = 0; DFhackCExport int SDL_Init(uint32_t flags) { // reroute stderr - freopen("stderr.log", "w", stderr); + if (!freopen("stderr.log", "w", stderr)) + fprintf(stderr, "dfhack: failed to reroute stderr\n"); // we don't reroute stdout until we figure out if this should be done at all // See: Console-linux.cpp