Changeset 21877 for main/trunk

Timestamp:

2010-04-14T10:00:26+12:00 (14 years ago)

Author:

kjdon

Message:

added ifndefs around the define _XOPEN_SOURCE. Adding in gsdlconf to gsdl_modules_cfg.h meant that XOPEN_SOURCE was already defined on linux and giving a compile warning.

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• collectoraction.cpp (modified) (1 diff)
• depositoraction.cpp (modified) (1 diff)
• wizardaction.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/recpt/collectoraction.cpp

@@ -36 +36 @@
 #define _STREAM_COMPAT  1
 // required for utsname on solaris???
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
+#endif
 // This was added for Solaris, but it makes things worse on Solaris for me...
 // #define _XOPEN_SOURCE_EXTENDED 1

main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp

@@ -36 +36 @@
 #define _STREAM_COMPAT  1
 // required for utsname on solaris???
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
+#endif
 // This was added for Solaris, but it makes things worse on Solaris for me...
 // #define _XOPEN_SOURCE_EXTENDED 1

main/trunk/greenstone2/runtime-src/src/recpt/wizardaction.cpp

@@ -36 +36 @@
 #define _STREAM_COMPAT  1
 // required for utsname on solaris???
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
+#endif
 // This was added for Solaris, but it makes things worse on Solaris for me...
 // #define _XOPEN_SOURCE_EXTENDED 1