From b5fea53af5ec3bc36688ef8556377a26a2b8d18a Mon Sep 17 00:00:00 2001 From: cas Date: Tue, 24 Jul 2001 18:23:28 +0000 Subject: [PATCH] No comments --- src/WOKUnix/WOKUnix_Dir.hxx | 6 ++--- src/WOKUnix/WOKUnix_DirEnt.hxx | 4 +-- src/WOKUnix/WOKUnix_FDSet.hxx | 4 +-- src/WOKUnix/WOKUnix_MaxPipeSize.hxx | 23 ++-------------- src/WOKUnix/WOKUnix_PathIterator.cxx | 5 ---- src/WOKUnix/WOKUnix_SigHandler.hxx | 39 ++++++++++++---------------- 6 files changed, 24 insertions(+), 57 deletions(-) diff --git a/src/WOKUnix/WOKUnix_Dir.hxx b/src/WOKUnix/WOKUnix_Dir.hxx index 973f5cf..9b9ac12 100755 --- 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 // @@ -9,15 +8,14 @@ #ifndef WNT -#include +# include 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 0a73f1b..cbdaf5b 100755 --- 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 // @@ -9,7 +8,7 @@ #ifndef WNT -#include +# include 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 ddfbb59..7687bc2 100755 --- 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 #define WOKUnix_FDSet_CAST fd_set * #endif -#ifdef HPUX +#if defined(__hpux) || defined(HPUX) #include #include #include diff --git a/src/WOKUnix/WOKUnix_MaxPipeSize.hxx b/src/WOKUnix/WOKUnix_MaxPipeSize.hxx index 8a7e870..23ecd99 100755 --- 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 // - +#ifndef WNT #ifndef WOKUnix_MaxPipeSize_HeaderFile #define WOKUnix_MaxPipeSize_HeaderFile - -#ifdef HPUX -#include -//#define MAX_PIPE_SIZE PIPSIZ -#define MAX_PIPE_SIZE 8190 -#elif IRIX -#include -#define MAX_PIPE_SIZE PIPE_MAX -#elif DECOSF1 -#include -#define MAX_PIPE_SIZE PIPE_BUF -#elif SOLARIS #include -#define MAX_PIPE_SIZE PIPE_MAX -#elif defined(LIN) -#include -#define MAX_PIPE_SIZE PIPE_BUF -#elif defined(AIX) #include -#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 531f77c..ab77c54 100755 --- a/src/WOKUnix/WOKUnix_PathIterator.cxx +++ b/src/WOKUnix/WOKUnix_PathIterator.cxx @@ -9,14 +9,9 @@ #include -#include - #include -//#include -//#include #include - 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 44e4aed..a6d088d 100755 --- 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 -#endif - -#ifdef SOLARIS -#include -#include - -#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 +# include + +# 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 -#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 +# 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); -- 2.39.5