diff --git a/cmake/Conky.cmake b/cmake/Conky.cmake
index c1a169dd..d004ace3 100644
--- a/cmake/Conky.cmake
+++ b/cmake/Conky.cmake
@@ -64,9 +64,6 @@ find_package(Threads)
 set(conky_libs ${CMAKE_THREAD_LIBS_INIT})
 set(conky_includes ${CMAKE_BINARY_DIR})
 
-add_definitions(-D_GNU_SOURCE) # Standard definitions
-set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
-
 # Do version stuff
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "0")
diff --git a/src/c++wrap.cc b/src/c++wrap.cc
index c21b4735..ac29e7a1 100644
--- a/src/c++wrap.cc
+++ b/src/c++wrap.cc
@@ -63,7 +63,8 @@ namespace {
 std::string strerror_r(int errnum)
 {
 	char buf[100];
-	return strerror_r(errnum, buf, sizeof buf);
+	strerror_r(errnum, buf, sizeof buf);
+	return buf;
 }
 
 std::pair<int, int> pipe2(int flags)