No comments

diff --git a/src/WOKTools/WOKTools_Error.cxx b/src/WOKTools/WOKTools_Error.cxx
index b2228a50480dc06d8b7550ba71d62920e6601dd6..5bd10411b3930819f3254f607ab2ba48bd1e0f3e 100755 (executable)
--- a/src/WOKTools/WOKTools_Error.cxx
+++ b/src/WOKTools/WOKTools_Error.cxx
@@ -3,7 +3,9 @@
 // Author:     Jean GAUTIER
 //             <jga@cobrax>
 
+#ifndef WNT
 #include <stream.h>
+#endif
 
 #include <WOKTools_Error.ixx>
 

diff --git a/src/WOKTools/WOKTools_Info.cxx b/src/WOKTools/WOKTools_Info.cxx
index f37f310eb85c80e81bff417813244cd71ce69c45..90f6507fe7b0c5439f24b00991123c3cc6c63a18 100755 (executable)
--- a/src/WOKTools/WOKTools_Info.cxx
+++ b/src/WOKTools/WOKTools_Info.cxx
@@ -1,5 +1,7 @@
 
+#ifndef WNT
 #include <stream.h>
+#endif
 
 #include <WOKTools_Info.ixx>
 

diff --git a/src/WOKTools/WOKTools_Options.cdl b/src/WOKTools/WOKTools_Options.cdl
index 1fc01e03c9cd747658dbf8137a76aa956cbe6006..3eee4a42f6372888ec99493e846cb81ab92d0d30 100755 (executable)
--- a/src/WOKTools/WOKTools_Options.cdl
+++ b/src/WOKTools/WOKTools_Options.cdl
@@ -61,7 +61,7 @@ fields
     myargv       : ArgTable                from WOKTools;
     mydefines    : HSequenceOfDefine       from WOKTools;
     mymore       : Boolean                 from Standard;
-    mycuropt     : Character               from Standard;
+    mycuropt     : Byte                    from Standard;
     mycurarg     : HAsciiString            from TCollection;
     mycurlistarg : HSequenceOfHAsciiString from TColStd;
     myargs       : HSequenceOfHAsciiString from TColStd;

diff --git a/src/WOKTools/WOKTools_Options.cxx b/src/WOKTools/WOKTools_Options.cxx
index e16f64228a749f4b088083ed7e272050e74ea185..196322343f1760587cb56c18482b038308bb7533 100755 (executable)
--- a/src/WOKTools/WOKTools_Options.cxx
+++ b/src/WOKTools/WOKTools_Options.cxx
@@ -55,7 +55,7 @@ WOKTools_Options::WOKTools_Options(const Standard_Integer argc,
   Next();
 
   // s'il il n'y a qu'une option
-  if(mycuropt == EOF) 
+  if(mycuropt == (Standard_Byte ) EOF) 
       mymore  = Standard_False;
 }
 
@@ -69,7 +69,7 @@ void WOKTools_Options::Next()
 
   mycuropt = getopt(myargc, myargv, myoptions->ToCString());
 
-  if(mycuropt == EOF)
+  if(mycuropt == (Standard_Byte ) EOF)
     {
       for( ; (optind < myargc) && (myargv[optind][0] != '-'); optind++)
        {
@@ -186,8 +186,9 @@ void WOKTools_Options::Next()
   
   if (myerrflg) // vider 
     {
-      Standard_Character acuropt = '\0';
-      while(acuropt != EOF)
+//      Standard_Character acuropt = '\0';
+      Standard_Byte acuropt = 0;
+      while(acuropt != (Standard_Byte ) EOF)
          acuropt = getopt(myargc, myargv, myoptions->ToCString());
     }
 

diff --git a/src/WOKTools/WOKTools_Options_proto.hxx b/src/WOKTools/WOKTools_Options_proto.hxx
index 4873f7751f33b8bf6d7e8269ec79d9ebacac18a8..146f36b0e75f4c5ed6df5f35720ba0522cb64ca6 100755 (executable)
--- a/src/WOKTools/WOKTools_Options_proto.hxx
+++ b/src/WOKTools/WOKTools_Options_proto.hxx
@@ -47,8 +47,8 @@ private:
   Standard_Integer myargc;
   WOKTools_ArgTable myargv;
   Handle_WOKTools_HSequenceOfDefine mydefines;
+  Standard_Byte mycuropt;
   Standard_Boolean mymore;
-  Standard_Character mycuropt;
   Handle_TCollection_HAsciiString mycurarg;
   Handle_TColStd_HSequenceOfHAsciiString mycurlistarg;
   Handle_TColStd_HSequenceOfHAsciiString myargs;

diff --git a/src/WOKTools/WOKTools_Verbose.cxx b/src/WOKTools/WOKTools_Verbose.cxx
index 939d829448c0df28bf34ee3a4b908c5bdc87881a..63b61fbd5998531c932a57d48f7495c57ec25c26 100755 (executable)
--- a/src/WOKTools/WOKTools_Verbose.cxx
+++ b/src/WOKTools/WOKTools_Verbose.cxx
@@ -3,8 +3,12 @@
 // Author:     Jean GAUTIER
 //             <jga@cobrax>
 
+#ifdef WNT
+#include <io.h>
+#else
 #include <stream.h>
 #include <unistd.h>
+#endif
 
 #include <WOKTools_Verbose.ixx>
 

diff --git a/src/WOKTools/WOKTools_Warning.cxx b/src/WOKTools/WOKTools_Warning.cxx
index d4201582e7e33802231c86ed1c1dde5ef5d9e626..baddb9183ade144b0e2c789cfa576e21078d60ad 100755 (executable)
--- a/src/WOKTools/WOKTools_Warning.cxx
+++ b/src/WOKTools/WOKTools_Warning.cxx
@@ -3,7 +3,9 @@
 // Author:     Jean GAUTIER
 //             <jga@cobrax>
 
+#ifndef WNT
 #include <stream.h>
+#endif
 
 #include <WOKTools_Warning.ixx>