Changeset 1600

Timestamp:

2000-10-11T16:50:43+13:00 (24 years ago)

Author:

jrm21

Message:

Sorry - got it right this time. We needed to #define _XOPEN_SOURCE
before we included <iostream>, as both include <features.h>, so the
second time (for unistd.h), _USE_XOPEN doesn't get set and crypt() doesn't
get declared.

Basically, I put the include crypt stuff before the include OBJECTSPACE stuff.
I hope this doesn't break something else (eg Windows compile...)

File:

• trunk/gsdl/src/getpw/getpw.cpp (modified) (2 diffs)

trunk/gsdl/src/getpw/getpw.cpp

@@ -24 +24 @@
  **********************************************************************/
 
-#if defined(GSDL_USE_OBJECTSPACE)
-#  include <ospace\std\iostream>
-#elif defined(GSDL_USE_IOS_H)
-#  include <iostream.h>
-#else
-#  include <iostream>
-#endif
-
 // include crypt
 #if defined(__WIN32__)
@@ -39 +31 @@
 #include <crypt.h>
 #else 
-#define _XOPEN_SOURCE
-/* don't think this is a standard macro, but seems to be needed.... */
-#define __USE_XOPEN
+#define _XOPEN_SOURCE 1
 #include <unistd.h>
 #endif
+#endif
+
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace\std\iostream>
+#elif defined(GSDL_USE_IOS_H)
+#  include <iostream.h>
+#else
+#  include <iostream>
 #endif