More fixes for Solaris.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6441322da47a4162e52517c35ae1e524e4ec37ae..53b9dc531e551ff8145cf9864ee1c4437a51f6d8 100644 (file)
--- 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 21cd9cfee3d34b38565e05967f7931d346e6c7a0..05571145e3e225c86d43e0bcef2f82e4bd04215c 100644 (file)
--- 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