No comments

diff --git a/src/WOKNT/WOKNT_AdmFile.cxx b/src/WOKNT/WOKNT_AdmFile.cxx
index 0e7ab7cd29f6206478b844fde3a2a05e62bf04f0..37b45c3225edcf9f6cd2332eeb126755c6aab475 100755 (executable)
--- a/src/WOKNT/WOKNT_AdmFile.cxx
+++ b/src/WOKNT/WOKNT_AdmFile.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 
@@ -103,3 +104,4 @@ TCollection_AsciiString WOKNT_AdmFile :: Name () const {
  return retVal;
 
 }  // end WOKNT_AdmFile :: Name
+#endif

diff --git a/src/WOKNT/WOKNT_CompareOfString.cxx b/src/WOKNT/WOKNT_CompareOfString.cxx
index a64a07a3df8b2369209e790cefe19c61318612b1..8352d884d068503069d78e0c5c3a98840324cf7e 100755 (executable)
--- a/src/WOKNT/WOKNT_CompareOfString.cxx
+++ b/src/WOKNT/WOKNT_CompareOfString.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #include <WOKNT_CompareOfString.ixx>
 
 WOKNT_CompareOfString :: WOKNT_CompareOfString () {
@@ -34,3 +35,4 @@ Standard_Boolean WOKNT_CompareOfString ::
 
 }  // end WOKNT_CompareOfString :: IsEqual
 
+#endif

diff --git a/src/WOKNT/WOKNT_CopyIfCh.c b/src/WOKNT/WOKNT_CopyIfCh.c
index 029fbe9896e363901cc42083c515231da17c1d10..9b519f39817b2367a33401ead1e68cbd891baef2 100755 (executable)
--- a/src/WOKNT/WOKNT_CopyIfCh.c
+++ b/src/WOKNT/WOKNT_CopyIfCh.c
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 
@@ -23,3 +24,4 @@ __declspec( dllexport ) int wokCopyIfCh ( int argc, char** argv ) {
  return status;
 
 }  /* end main */
+#endif

diff --git a/src/WOKNT/WOKNT_MixedOutput.cxx b/src/WOKNT/WOKNT_MixedOutput.cxx
index f0c5caa379c138c44f0e6535d5925517fb64640a..806aec2773b2cb4fac3c2037b038bed07c4654a7 100755 (executable)
--- a/src/WOKNT/WOKNT_MixedOutput.cxx
+++ b/src/WOKNT/WOKNT_MixedOutput.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 
@@ -189,3 +190,4 @@ void __fastcall _WOKNT_create_pipe (
  ) *writePipe = ( Standard_Integer )INVALID_HANDLE_VALUE;
                 
 }  // end _WOKNT_create_pipe
+#endif

diff --git a/src/WOKNT/WOKNT_OutErrOutput.cxx b/src/WOKNT/WOKNT_OutErrOutput.cxx
index a006cd54f3218668326aaada3fd4ea08114a3861..f862bb2b90c53c298d7b7534fa74f6d235b81b4f 100755 (executable)
--- a/src/WOKNT/WOKNT_OutErrOutput.cxx
+++ b/src/WOKNT/WOKNT_OutErrOutput.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 
@@ -102,3 +103,4 @@ Handle( TColStd_HSequenceOfHAsciiString ) WOKNT_OutErrOutput :: SyncStdErr () {
  return retVal;
 
 }  // end WOKNT_OutErrOutput :: SyncStdErr
+#endif

diff --git a/src/WOKNT/WOKNT_Path.cxx b/src/WOKNT/WOKNT_Path.cxx
index 98ba8f544cc533d45d124d1835988027173d909e..14c0940947e26a21a679b9395ed89261215a305b 100755 (executable)
--- a/src/WOKNT/WOKNT_Path.cxx
+++ b/src/WOKNT/WOKNT_Path.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 
@@ -615,3 +616,4 @@ Standard_Boolean WOKNT_Path::IsFile ()
   if(myAttr & FILE_ATTRIBUTE_DIRECTORY) return Standard_False; 
   return Standard_True;
 }
+#endif

diff --git a/src/WOKNT/WOKNT_PathIterator.cxx b/src/WOKNT/WOKNT_PathIterator.cxx
index e2d2cf13a6a13d62c6b4419401ce2cdb0aa4736d..4d6c7e997c6d9dbce4e06274d79d503bb498e8ca 100755 (executable)
--- a/src/WOKNT/WOKNT_PathIterator.cxx
+++ b/src/WOKNT/WOKNT_PathIterator.cxx
@@ -1,4 +1,4 @@
-
+#ifdef WNT
 
 #include <WOKNT_PathIterator.ixx>
 #include <WOKNT_Path.hxx>
@@ -183,3 +183,4 @@ void WOKNT_PathIterator::Destroy() const
   if(myStack.Top() != INVALID_HANDLE_VALUE) FindClose(myStack.Top());
 }
 
+#endif

diff --git a/src/WOKNT/WOKNT_RegExp.cxx b/src/WOKNT/WOKNT_RegExp.cxx
index ad71db26d74621d7f4d195f0324dc13f69b9b25e..9a0ded67c9b315f0240a11721877b639310a3a8f 100755 (executable)
--- a/src/WOKNT/WOKNT_RegExp.cxx
+++ b/src/WOKNT/WOKNT_RegExp.cxx
@@ -1,4 +1,4 @@
-
+#ifdef WNT
 #include <WOKNT_RegExp.ixx>
 
 #include <WOKNT_regexp.h>
@@ -157,3 +157,4 @@ Standard_Integer WOKNT_RegExp :: Match (
 
 }  // end WOKNT_RegExp :: Match
 
+#endif

diff --git a/src/WOKNT/WOKNT_ReplIfCh.c b/src/WOKNT/WOKNT_ReplIfCh.c
index 500404ac33a392826d52287948e2e43dc755acc2..4913f0ac46d0c1b424ccfd05db186c542d7418a9 100755 (executable)
--- a/src/WOKNT/WOKNT_ReplIfCh.c
+++ b/src/WOKNT/WOKNT_ReplIfCh.c
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <process.h>
 #include <windows.h>
@@ -28,3 +29,4 @@ __declspec( dllexport ) int wokReplIfCh ( int argc, char** argv ) {
  return status;
 
 }  /* end main */
+#endif

diff --git a/src/WOKNT/WOKNT_ReplIfChWith.c b/src/WOKNT/WOKNT_ReplIfChWith.c
index b83c4b2331157d531200d240c6fb1c422abf98cf..30bfafacc5e6b3c49455e5d584f94a99d9267134 100755 (executable)
--- a/src/WOKNT/WOKNT_ReplIfChWith.c
+++ b/src/WOKNT/WOKNT_ReplIfChWith.c
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <process.h>
 #include <windows.h>
@@ -28,3 +29,4 @@ __declspec( dllexport ) int wokReplIfChWith ( int argc, char** argv ) {
  return status;
 
 }  /* end main */
+#endif

diff --git a/src/WOKNT/WOKNT_Shell.cxx b/src/WOKNT/WOKNT_Shell.cxx
index ec3fd20d565badd01e6428c8119d6d78e2075811..a6f0e468b426106a1a1f644e8ba2ec35bd2fee09 100755 (executable)
--- a/src/WOKNT/WOKNT_Shell.cxx
+++ b/src/WOKNT/WOKNT_Shell.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 #include <tchar.h>
@@ -608,3 +609,4 @@ static void _WOKNT_get_env (  Handle( TColStd_HSequenceOfHAsciiString )& seq  )
  FreeEnvironmentStrings ( env );
 
 }  // end _WOKNT_get_env
+#endif

diff --git a/src/WOKNT/WOKNT_ShellManager.cxx b/src/WOKNT/WOKNT_ShellManager.cxx
index 20896cd8d7c38fd122c5dca4a6d739338f0877df..529521e3a7b481dc42c913f96a1053ec4240bb8f 100755 (executable)
--- a/src/WOKNT/WOKNT_ShellManager.cxx
+++ b/src/WOKNT/WOKNT_ShellManager.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 #include <tchar.h>
@@ -96,3 +97,4 @@ static BOOL CALLBACK interruptHandler ( DWORD dwCode ) {
  return TRUE;
 
 }  // end interruptHandler
+#endif

diff --git a/src/WOKNT/WOKNT_ShellOutput.cxx b/src/WOKNT/WOKNT_ShellOutput.cxx
index 90c466471cd6124fab78150beff5efdb43a6d9f1..cb5e5969027e06c09a46134c5ff893ffc8343aec 100755 (executable)
--- a/src/WOKNT/WOKNT_ShellOutput.cxx
+++ b/src/WOKNT/WOKNT_ShellOutput.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 
@@ -12,3 +13,4 @@ void WOKNT_ShellOutput :: Cleanup () {
  if (  ( HANDLE )myFileChannel != INVALID_HANDLE_VALUE  ) Close ();
 
 }  // end WOKNT_ShellOutput :: Cleanup
+#endif

diff --git a/src/WOKNT/WOKNT_Shell_1.cxx b/src/WOKNT/WOKNT_Shell_1.cxx
index f13a5d568a57cb6b4c6a734f1cc0faea340dad9c..01f239e6d73761a5e258162484a6173658bc7a50 100755 (executable)
--- a/src/WOKNT/WOKNT_Shell_1.cxx
+++ b/src/WOKNT/WOKNT_Shell_1.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 
@@ -433,3 +434,4 @@ static void __fastcall _WOKNT_strip_string (  Handle( TCollection_HAsciiString )
  }  // end else
 
 }  // end _WOKNT_strip_string
+#endif

diff --git a/src/WOKNT/WOKNT_chmod.cxx b/src/WOKNT/WOKNT_chmod.cxx
index 9afbc8464a04d3a759a62f60282faedc0ccc27ee..21fa77e46a7d5c7e93af830db0487f0cececbffa 100755 (executable)
--- a/src/WOKNT/WOKNT_chmod.cxx
+++ b/src/WOKNT/WOKNT_chmod.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define EXPORT
 #include <iostream.h>
 #include <stdlib.h>
@@ -267,3 +268,4 @@ static BOOL _chmod_func ( LPTSTR fName, BOOL fDir, void* data ) {
  return TRUE;
 
 }  // end _chmod_func
+#endif

diff --git a/src/WOKNT/WOKNT_cmp.c b/src/WOKNT/WOKNT_cmp.c
index ef312940e74503df285a42433f038091bceac165..dcd25c692df4ad3dafecc866459fa122dc70df7e 100755 (executable)
--- a/src/WOKNT/WOKNT_cmp.c
+++ b/src/WOKNT/WOKNT_cmp.c
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 
@@ -65,3 +66,4 @@ __declspec( dllexport ) int wokCMP ( int argc, char** argv )
   
   return retVal;
 }
+#endif

diff --git a/src/WOKNT/WOKNT_cp.cxx b/src/WOKNT/WOKNT_cp.cxx
index d90796a97cd3b4ee8e34444fa1fd43028abf43fe..322e89e73e9df37556773d4babb0796eaa69f7b4 100755 (executable)
--- a/src/WOKNT/WOKNT_cp.cxx
+++ b/src/WOKNT/WOKNT_cp.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define STRICT
 #include <windows.h>
 #include <string.h>
@@ -122,3 +123,4 @@ int wokCP( int argc, char** argv )
  }
  return retVal;
 } 
+#endif

diff --git a/src/WOKNT/WOKNT_mv.cxx b/src/WOKNT/WOKNT_mv.cxx
index 1c6e77e0013f60f385fb22f774b5b827637ea104..29dbf01eeb86581df0622cff190808c9ee3a511f 100755 (executable)
--- a/src/WOKNT/WOKNT_mv.cxx
+++ b/src/WOKNT/WOKNT_mv.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define EXPORT
 #define STRICT
 #include <windows.h>
@@ -34,3 +35,4 @@ int wokMV ( int argc, char** argv ) {
  return 0;
 
 }  // end main
+#endif

diff --git a/src/WOKNT/WOKNT_regexp_1.c b/src/WOKNT/WOKNT_regexp_1.c
index 8305a0fb5dedb7a886aef958d8c292c27612fb3b..1b9f070942e309833c8d00c93424f6c05d17ed3c 100755 (executable)
--- a/src/WOKNT/WOKNT_regexp_1.c
+++ b/src/WOKNT/WOKNT_regexp_1.c
@@ -1,3 +1,4 @@
+#ifdef WNT
 /******************************************************************************/
 /* Extended regular expression matching and search.                           */
 /* Copyright (C) 1985 Free Software Foundation, Inc.                          */
@@ -26,10 +27,12 @@
 /***/
 
 /* JGA : to compile on Solaris */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
-#if !defined(HPUX) && !defined (WNT)
-#include <alloca.h>
-
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
 #else
 /* alloca() non disponible sur HPUX 9.07 */
 # ifdef __cplusplus
@@ -1733,3 +1736,4 @@ static int bcmp_translate (
 }  /* end bcmp_translate */
 /***/
 /******************************************************************************/
+#endif

diff --git a/src/WOKNT/WOKNT_rm.cxx b/src/WOKNT/WOKNT_rm.cxx
index 4a85aeb94b774158d2df0d36b8c8aceedeee6f2d..a9b69546d6e1944938ae9a16bb7b901754b71658 100755 (executable)
--- a/src/WOKNT/WOKNT_rm.cxx
+++ b/src/WOKNT/WOKNT_rm.cxx
@@ -1,3 +1,4 @@
+#ifdef WNT
 #define EXPORT
 #include <iostream.h>
 #include <stdlib.h>
@@ -195,3 +196,4 @@ static void _print_error ( LPCTSTR fName ) {
  cerr << "wokRM: could not remove " << fName << " - " << buffer << endl << flush;
 
 }  // end _set_error
+#endif