No comments

diff --git a/src/WOKTools/WOKTools_BasicMap.cxx b/src/WOKTools/WOKTools_BasicMap.cxx
index 2bd529941a0e2bf84fdec727091d51d36854c88f..a2313c0b7e0b7f4f2722cc48a151e7e0bc4e7edf 100755 (executable)
--- a/src/WOKTools/WOKTools_BasicMap.cxx
+++ b/src/WOKTools/WOKTools_BasicMap.cxx
@@ -6,19 +6,27 @@
 #include <WOKTools_BasicMap.ixx>
 #include <TCollection.hxx>
 #include <WOKTools_BasicMapIterator.hxx>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #ifdef WNT
 #include <windows.h>
 #else
-#include <unistd.h>
-#include <memory.h>
+# include <memory.h>
 #endif
 
-#include <malloc.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
-#ifdef LIN
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+
+#ifdef HAVE_IOMANIP_H
 # include <iomanip.h>
-#endif  // LIN
+#endif
 
 //=======================================================================
 //function : WOKTools_BasicMap

diff --git a/src/WOKTools/WOKTools_Options.cxx b/src/WOKTools/WOKTools_Options.cxx
index 196322343f1760587cb56c18482b038308bb7533..24f178247cbd4541fb527366499a2669aa93c9a5 100755 (executable)
--- a/src/WOKTools/WOKTools_Options.cxx
+++ b/src/WOKTools/WOKTools_Options.cxx
@@ -3,10 +3,17 @@
 // Author:     Jean GAUTIER
 //             <jga@cobrax>
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #include <string.h>
 #include <stdlib.h>
 
-
 #include <WOKTools_Options.ixx>
 
 #include <WOKTools_Define.hxx>
@@ -14,7 +21,7 @@
 
 #include <TCollection_AsciiString.hxx>
 
-#if defined( LIN )
+#if defined(HAVE_GETOPT_H) && !defined(HAVE_UNISTD_H)
 # include <getopt.h>
 #elif !defined( WNT )
 extern char *optarg;
@@ -22,7 +29,7 @@ extern int  optind;
 #else
 extern "C" Standard_IMPORT char *optarg;
 extern "C" Standard_IMPORT int   optind;
-extern "C" Standard_IMPORT int   getopt ( int, char**, char* );
+extern "C" Standard_IMPORT int   getopt( int, char**, char* );
 #endif  // WNT
 
 //=======================================================================
@@ -43,7 +50,7 @@ WOKTools_Options::WOKTools_Options(const Standard_Integer argc,
   mydefines = new WOKTools_HSequenceOfDefine;
   myargs    = new TColStd_HSequenceOfHAsciiString;
   myerrflg  = Standard_False;
-#if !defined( WNT ) && !defined( LIN )
+#if !defined( WNT ) && !defined( __GNUC__ )
   optind    = 1;
 #else
   optind    = 0;

diff --git a/src/WOKTools/WOKTools_Verbose.cxx b/src/WOKTools/WOKTools_Verbose.cxx
index 63b61fbd5998531c932a57d48f7495c57ec25c26..1516c2646a4179735708b5cbebd150d489560c2d 100755 (executable)
--- a/src/WOKTools/WOKTools_Verbose.cxx
+++ b/src/WOKTools/WOKTools_Verbose.cxx
@@ -4,10 +4,13 @@
 //             <jga@cobrax>
 
 #ifdef WNT
-#include <io.h>
-#else
-#include <stream.h>
-#include <unistd.h>
+# include <io.h>
+#endif
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
 #include <WOKTools_Verbose.ixx>

diff --git a/src/WOKTools/WOKTools_Warning.cxx b/src/WOKTools/WOKTools_Warning.cxx
index baddb9183ade144b0e2c789cfa576e21078d60ad..14707a78c9a043bb70709b7934cff1128ce89019 100755 (executable)
--- a/src/WOKTools/WOKTools_Warning.cxx
+++ b/src/WOKTools/WOKTools_Warning.cxx
@@ -3,10 +3,6 @@
 // Author:     Jean GAUTIER
 //             <jga@cobrax>
 
-#ifndef WNT
-#include <stream.h>
-#endif
-
 #include <WOKTools_Warning.ixx>
 
 Standard_EXPORT WOKTools_Warning WarningMsg;
@@ -16,6 +12,5 @@ WOKTools_Warning::WOKTools_Warning() : WOKTools_Message("WOK_WARNING", "Warning
   Set();
 }
 
-
 Standard_Character WOKTools_Warning::Code() const 
 {return 'W';}