No comments

diff --git a/src/WOKUnix/WOKUnix_Dir.hxx b/src/WOKUnix/WOKUnix_Dir.hxx
index 973f5cf8107f053dd7d737f0c14ec9ac7c69bff4..9b9ac12693cb7de138507325c8df2ed8dc422ac3 100755 (executable)
--- a/src/WOKUnix/WOKUnix_Dir.hxx
+++ b/src/WOKUnix/WOKUnix_Dir.hxx
@@ -1,4 +1,3 @@
-#ifndef WNT
 // File:       WOKUnix_Dir.hxx
 // Author:     Jean GAUTIER
 //             <jga@cobrax>
@@ -9,15 +8,14 @@
 
 #ifndef WNT 
 
-#include <dirent.h>
+# include <dirent.h>
 
 typedef DIR* WOKUnix_Dir;
 
 #else
 
-#error "Type Dir does not exist on WNT"
+# error "Type Dir does not exist on WNT"
 
 #endif
 
 #endif
-#endif

diff --git a/src/WOKUnix/WOKUnix_DirEnt.hxx b/src/WOKUnix/WOKUnix_DirEnt.hxx
index 0a73f1b4ffe1fb9f3c7bbdf5ae319ed39eab45d1..cbdaf5bbe63b64a5af595e6087b1cfe6cfca4ca6 100755 (executable)
--- a/src/WOKUnix/WOKUnix_DirEnt.hxx
+++ b/src/WOKUnix/WOKUnix_DirEnt.hxx
@@ -1,4 +1,3 @@
-#ifndef WNT
 // File:       WOKUnix_Dir.hxx
 // Author:     Jean GAUTIER
 //             <jga@cobrax>
@@ -9,7 +8,7 @@
 
 #ifndef WNT 
 
-#include <dirent.h>
+# include <dirent.h>
 
 typedef struct dirent* WOKUnix_DirEnt;
 
@@ -20,4 +19,3 @@ typedef struct dirent* WOKUnix_DirEnt;
 #endif
 
 #endif
-#endif

diff --git a/src/WOKUnix/WOKUnix_FDSet.hxx b/src/WOKUnix/WOKUnix_FDSet.hxx
index ddfbb59c3f143f7b193c1c9ba78107e6c173aaf0..7687bc275a30687864d4b029d288a602061634a4 100755 (executable)
--- a/src/WOKUnix/WOKUnix_FDSet.hxx
+++ b/src/WOKUnix/WOKUnix_FDSet.hxx
@@ -8,12 +8,12 @@
 #ifndef WOKUnix_FDSet_HeaderFile
 #define WOKUnix_FDSet_HeaderFile
 
-#ifndef HPUX
+#if (!defined(__hpux))  && (!defined(HPUX) )
 #include <sys/select.h>
 #define WOKUnix_FDSet_CAST fd_set *
 #endif
 
-#ifdef HPUX
+#if defined(__hpux)  || defined(HPUX) 
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>

diff --git a/src/WOKUnix/WOKUnix_MaxPipeSize.hxx b/src/WOKUnix/WOKUnix_MaxPipeSize.hxx
index 8a7e870d963312e054c2ec48b87fa631414ae547..23ecd99bab25bedd2d4ab583d55146552edfdb84 100755 (executable)
--- a/src/WOKUnix/WOKUnix_MaxPipeSize.hxx
+++ b/src/WOKUnix/WOKUnix_MaxPipeSize.hxx
@@ -1,35 +1,16 @@
-#ifndef WNT
 // File:       WOKUnix_MaxPipeSize.hxx
 // Created:    Fri May 12 10:09:01 1995
 // Author:     Jean GAUTIER
 //             <jga@cobrax>
-
+#ifndef WNT
 
 #ifndef WOKUnix_MaxPipeSize_HeaderFile
 #define WOKUnix_MaxPipeSize_HeaderFile
 
-
-#ifdef HPUX
-#include <sys/inode.h>
-//#define MAX_PIPE_SIZE  PIPSIZ
-#define MAX_PIPE_SIZE 8190
-#elif  IRIX
-#include <limits.h>
-#define MAX_PIPE_SIZE PIPE_MAX
-#elif  DECOSF1
-#include <sys/param.h>
-#define MAX_PIPE_SIZE PIPE_BUF
-#elif SOLARIS
 #include <sys/param.h>
-#define MAX_PIPE_SIZE PIPE_MAX
-#elif defined(LIN)
-#include <limits.h>
-#define MAX_PIPE_SIZE PIPE_BUF
-#elif defined(AIX)
 #include <limits.h>
-#define MAX_PIPE_SIZE PIPE_BUF
-#endif
 
+#define MAX_PIPE_SIZE PIPE_BUF
 
 #endif
 #endif

diff --git a/src/WOKUnix/WOKUnix_PathIterator.cxx b/src/WOKUnix/WOKUnix_PathIterator.cxx
index 531f77c225aac8c1cf1adcde9c9a2b3bdbd2efc1..ab77c5467848e3b8aca60bdaea123f4433a7be59 100755 (executable)
--- a/src/WOKUnix/WOKUnix_PathIterator.cxx
+++ b/src/WOKUnix/WOKUnix_PathIterator.cxx
@@ -9,14 +9,9 @@
 
 #include <WOKTools_Messages.hxx>
 
-#include <stream.h>
-
 #include <stdio.h>
-//#include <sys/types.h>
-//#include <sys/stat.h>
 #include <dirent.h>
 
-
 WOKUnix_PathIterator::WOKUnix_PathIterator(const Handle(WOKUnix_Path)& apath, const Standard_Boolean abool, const Standard_CString amask) 
 : mymask(amask), mypath(apath), myrecflag(abool)
 {

diff --git a/src/WOKUnix/WOKUnix_SigHandler.hxx b/src/WOKUnix/WOKUnix_SigHandler.hxx
index 44e4aed554d56717ea6caf0eeee60317824c67e1..a6d088d39fdc82128986d289c9fb43da0620c72c 100755 (executable)
--- a/src/WOKUnix/WOKUnix_SigHandler.hxx
+++ b/src/WOKUnix/WOKUnix_SigHandler.hxx
@@ -8,31 +8,26 @@
 #ifndef WOKUnix_SigHandler_HeaderFile
 #define WOKUnix_SigHandler_HeaderFile
 
-
-#ifdef SUN
-#include <floatingpoint.h>
-#endif
-
-#ifdef SOLARIS
-#include <floatingpoint.h>
-#include <sys/machsig.h>
-
-#define FPE_FLTDIV_TRAP FPE_FLTDIV 
-#define FPE_INTDIV_TRAP FPE_INTDIV 
-#define FPE_FLTOVF_TRAP FPE_FLTOVF 
-#define FPE_INTOVF_TRAP FPE_INTOVF
-#define FPE_FLTUND_TRAP FPE_FLTUND 
-extern "C" {int ieee_handler(char *,char *, sigfpe_handler_type&);}
+#if defined (__sun ) || defined ( SOLARIS )
+# include <floatingpoint.h>
+# include <sys/machsig.h>
+
+# define FPE_FLTDIV_TRAP FPE_FLTDIV 
+# define FPE_INTDIV_TRAP FPE_INTDIV 
+# define FPE_FLTOVF_TRAP FPE_FLTOVF 
+# define FPE_INTOVF_TRAP FPE_INTOVF
+# define FPE_FLTUND_TRAP FPE_FLTUND 
+ extern "C" {int ieee_handler(char *,char *, sigfpe_handler_type&);}
 #endif
 
 
-#ifdef IRIX
-#include <sys/siginfo.h>
-#define FPE_FLTDIV_TRAP FPE_FLTDIV 
-#define FPE_INTDIV_TRAP FPE_INTDIV 
-#define FPE_FLTOVF_TRAP FPE_FLTOVF 
-#define FPE_INTOVF_TRAP FPE_INTOVF
-#define FPE_FLTUND_TRAP FPE_FLTUND 
+#if defined (__irix) || defined ( IRIX )
+# include <sys/siginfo.h>
+# define FPE_FLTDIV_TRAP FPE_FLTDIV 
+# define FPE_INTDIV_TRAP FPE_INTDIV 
+# define FPE_FLTOVF_TRAP FPE_FLTOVF 
+# define FPE_INTOVF_TRAP FPE_INTOVF
+# define FPE_FLTUND_TRAP FPE_FLTUND 
 #endif 
 
 typedef void (* WOKUnix_SigHandler) (int);