[poppler] 2 commits - cmake/modules configure.ac poppler/GlobalParams.cc test/perf-test.cc

[Albert Astals Cid]

 cmake/modules/PopplerMacros.cmake |    2 +-
 configure.ac                      |    2 +-
 poppler/GlobalParams.cc           |    2 ++
 test/perf-test.cc                 |    2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a8d43ec1c7f5448a7f63d9bbd9062d56ee1c7c58
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Apr 14 19:21:33 2010 +0100

    update XOPEN_SOURCE to 600 in non standard compile options
    
    it seems helps compiling on some BSD

diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index befd20a..e6b1efc 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -102,7 +102,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   # set the default compile warnings
   set(DEFAULT_COMPILE_WARNINGS_NO)
   set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wno-write-strings")
-  set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+  set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
 
   set(CMAKE_CXX_FLAGS                "-Wnon-virtual-dtor -Woverloaded-virtual")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
diff --git a/configure.ac b/configure.ac
index 72041d5..0a83b08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,7 +598,7 @@ case "$enable_compile_warnings" in
   no)	;;
   yes)	CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual -Wnon-virtual-dtor -ansi $CXXFLAGS" ;;
   kde)	CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi \
-		-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align \
+		-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
 		-Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith \
 		-Wwrite-strings -O2 -Wformat-security \
 		-Wmissing-format-attribute -fno-exceptions -fno-check-new \
commit 4cce1f14e964edf1bf2d9fb8286ee002a67dc212
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Apr 13 21:57:16 2010 +0100

    include strings.h on non windows platforms

diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 09a1b20..bf79585 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -68,6 +68,8 @@
 
 #ifdef _WIN32
 #  define strcasecmp stricmp
+#else
+#  include <strings.h>
 #endif
 
 #if MULTITHREADED
diff --git a/test/perf-test.cc b/test/perf-test.cc
index a11a377..6d6961e 100644
--- a/test/perf-test.cc
+++ b/test/perf-test.cc
@@ -22,6 +22,8 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#else
+#include <strings.h>
 #endif
 
 // Define COPY_FILE if you want the file to be copied to a local disk first