From cc379455b9af020d4a3d16885da92289dc15d458 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 20 Jun 2013 12:47:11 +0100 Subject: [PATCH] More fixes for Solaris. --- CMakeLists.txt | 2 +- contrib/hiredis/fmacros.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6441322da..53b9dc531 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,7 +294,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SUN_BUILD64}") ENDIF (BUILD_CPU_MODE STREQUAL "32") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__EXTENSIONS__ -DSOLARIS") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__EXTENSIONS__ -DSOLARIS -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200112L") IF(CMAKE_INSTALL_PREFIX) IF(NOT ETC_PREFIX) diff --git a/contrib/hiredis/fmacros.h b/contrib/hiredis/fmacros.h index 21cd9cfee..05571145e 100644 --- a/contrib/hiredis/fmacros.h +++ b/contrib/hiredis/fmacros.h @@ -5,12 +5,4 @@ #define _BSD_SOURCE #endif -#if defined(__sun__) -#define _POSIX_C_SOURCE 200112L -#elif defined(__linux__) -#define _XOPEN_SOURCE 600 -#else -#define _XOPEN_SOURCE -#endif - #endif -- 2.39.5