Changeset 3015

Timestamp:

2002-02-27T13:10:35+13:00 (22 years ago)

Author:

jrm21

Message:

include getopt_old.h if we are compiling on cygwin

Location:

trunk/gsdl/src/mgpp/text

Files:

• Queryer.cpp (modified) (1 diff)
• mgpp_compression_dict.cpp (modified) (1 diff)
• mgpp_decompress_text.cpp (modified) (1 diff)
• mgpp_fast_comp_dict.cpp (modified) (1 diff)
• mgpp_invf_dict.cpp (modified) (1 diff)
• mgpp_invf_dict_dump.cpp (modified) (1 diff)
• mgpp_invf_dump.cpp (modified) (1 diff)
• mgpp_passes.cpp (modified) (1 diff)
• mgpp_perf_hash_build.cpp (modified) (1 diff)
• mgpp_stem_idx.cpp (modified) (1 diff)
• mgpp_weights_build.cpp (modified) (1 diff)

trunk/gsdl/src/mgpp/text/Queryer.cpp

@@ -23 +23 @@
 #define _XOPEN_SOURCE_EXTENDED 1
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_compression_dict.cpp

@@ -28 +28 @@
 #endif
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_decompress_text.cpp

@@ -23 +23 @@
 #define _XOPEN_SOURCE_EXTENDED 1
 
-#if defined __WIN32__
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_fast_comp_dict.cpp

@@ -28 +28 @@
 #endif
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_invf_dict.cpp

@@ -28 +28 @@
 #endif
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_invf_dict_dump.cpp

@@ -28 +28 @@
 #endif
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_invf_dump.cpp

@@ -28 +28 @@
 #endif
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_passes.cpp

@@ -40 +40 @@
 # define close _close
 # define open _open
+#elif defined __CYGWIN__
+#include "getopt_old.h"
 #else
 # include <unistd.h>

trunk/gsdl/src/mgpp/text/mgpp_perf_hash_build.cpp

@@ -28 +28 @@
 #endif
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_stem_idx.cpp

@@ -23 +23 @@
 #define _XOPEN_SOURCE_EXTENDED 1
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else

trunk/gsdl/src/mgpp/text/mgpp_weights_build.cpp

@@ -23 +23 @@
 #define _XOPEN_SOURCE_EXTENDED 1
 
-#if defined (__WIN32__)
+/* getopt is in posix.2, so cygwin should have it in unistd, but doesn't */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 # include "getopt_old.h"
 #else