0020716: Eliminate usage of "config.h" header file

All inclusions of "config.h" were removed.

All places where macros defined by config.h were checked and removed

Small corrections for mac os.

Unused code in file OSD_Disk.cxx was removed.

Unused macros and includes were removed from samples and code.

Added necessary includes for MacOS.

Correct new additional compilation warning on Linux platform.

Fix for error in OSD_Chronometer on Debian70/Fedora18

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7aeeb1db68f7b135f20a05139352ff17a2dc8c6..4c841d141cd69e1deb0736756e07bcd282da09e1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,9 +111,9 @@ add_definitions(-DCSFDB)
 if(WIN32)
   add_definitions(/DWNT -wd4996)
 elseif(APPLE)
-  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H)
+  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS)
 else()
-  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -DLIN)
+  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DLIN)
 endif()
 
 # enable structured exceptions for MSVC

diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro
index 05ccdcfc4679d9007291b5977dedcc34cd713dd1..b2127cd78ad7e4c87dc3e18a6f65387dd8fc0bb3 100755 (executable)
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -51,7 +51,7 @@ unix {
     !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
     !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
     equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
-    DEFINES += OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
+    DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
     !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
     LIBS += -lfreeimageplus
     LIBS += -ltbb -ltbbmalloc

diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro
index e133f70e4717189341f57100142e5af4f6d1b0a1..e0b4e2f3ed676d3cd8ee2ebdbac90ea5ab29fdb4 100755 (executable)
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -54,7 +54,7 @@ unix {
     !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
     !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
     equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
-    DEFINES += OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
+    DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
     !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
     LIBS += -lfreeimageplus
     LIBS += -ltbb -ltbbmalloc

diff --git a/samples/qt/VoxelDemo/VoxelDemo.pro b/samples/qt/VoxelDemo/VoxelDemo.pro
index 0fd231878154db11a4e79d10663c44b641c72b5e..d99102ec858344fed1a4a5babeff7543b30cd164 100644 (file)
--- a/samples/qt/VoxelDemo/VoxelDemo.pro
+++ b/samples/qt/VoxelDemo/VoxelDemo.pro
@@ -39,7 +39,7 @@ unix {
     !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
     !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
     equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
-    DEFINES += OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
+    DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
     !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
     LIBS += -lfreeimageplus
     LIBS += -ltbb -ltbbmalloc

diff --git a/src/BRepTest/BRepTest_ChamferCommands.cxx b/src/BRepTest/BRepTest_ChamferCommands.cxx
index 45e2347f46c8519d6dc79a9f73e74a7894440af1..e53de8a766062a10128191255bc02fae0f476203 100644 (file)
--- a/src/BRepTest/BRepTest_ChamferCommands.cxx
+++ b/src/BRepTest/BRepTest_ChamferCommands.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <Draw_Interpretor.hxx>
 #include <BRepTest.hxx>
 #include <Draw.hxx>
@@ -31,11 +27,6 @@
 #include <TopoDS_Shape.hxx>
 
 #include <Precision.hxx>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-
 
 //=========================================================================
 // function : chamfer

diff --git a/src/BRepTest/BRepTest_CheckCommands.cxx b/src/BRepTest/BRepTest_CheckCommands.cxx
index 701aca32328425f28a4c43dbbccb34052a382b9c..f13c5ee3377ca97690346149c280de65e261208f 100644 (file)
--- a/src/BRepTest/BRepTest_CheckCommands.cxx
+++ b/src/BRepTest/BRepTest_CheckCommands.cxx
@@ -15,10 +15,6 @@
 // commercial license or contractual agreement.
 
 #include <BRepTest.hxx>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <BRepAlgo.hxx>
 #include <BRepCheck_Analyzer.hxx>
 #include <BRepCheck_Result.hxx>
@@ -72,9 +68,6 @@
 #include <Standard_Failure.hxx>
 
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 static char* checkfaultyname = NULL;
 Standard_EXPORT void BRepTest_CheckCommands_SetFaultyName(const char* name)

diff --git a/src/BRepTest/BRepTest_FeatureCommands.cxx b/src/BRepTest/BRepTest_FeatureCommands.cxx
index 54da5a851a139c3a8209faa8d20a8afac861d090..c4df4eb29707bcf19361a86f11c9ba9b07bc8c1c 100644 (file)
--- a/src/BRepTest/BRepTest_FeatureCommands.cxx
+++ b/src/BRepTest/BRepTest_FeatureCommands.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
 #include <DrawTrSurf.hxx>
@@ -71,13 +67,10 @@
 
 #include <Precision.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 //#define strcasecmp _stricmp Already defined
 Standard_IMPORT Draw_Viewer dout;
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 static BRepFeat_MakeCylindricalHole theHole;
 static Standard_Boolean WithControl = Standard_True;

diff --git a/src/BRepTest/BRepTest_FilletCommands.cxx b/src/BRepTest/BRepTest_FilletCommands.cxx
index 8c45f8e154221652b31032a527eb2a865c9cdb11..ec1c1c8448866aa3222acf5a7e96eee01197c960 100644 (file)
--- a/src/BRepTest/BRepTest_FilletCommands.cxx
+++ b/src/BRepTest/BRepTest_FilletCommands.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
 #include <BRepTest.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <DBRep.hxx>
@@ -57,14 +52,7 @@
 #include <TopAbs.hxx>
 #include <DrawTrSurf.hxx>
 
-#ifdef WNT
-//#define strcasecmp strcmp Already defined
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #include <stdio.h>
-//#endif
 
 
 static Standard_Real t3d = 1.e-4;

diff --git a/src/BRepTest/BRepTest_SurfaceCommands.cxx b/src/BRepTest/BRepTest_SurfaceCommands.cxx
index fff7fb20ade5e535367c3a4f93d254191ee8f130..cf26e9411e35be3d0b51048e6cd157a7affbad64 100644 (file)
--- a/src/BRepTest/BRepTest_SurfaceCommands.cxx
+++ b/src/BRepTest/BRepTest_SurfaceCommands.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <stdio.h>
 #include <BRepTest.hxx>
 #include <GeometryTest.hxx>
@@ -46,13 +43,10 @@
 #include <Precision.hxx>
 #include <Draw_ProgressIndicator.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 //#define strcasecmp strcmp Already defined
 #include <stdio.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 //-----------------------------------------------------------------------
 // suppressarg : suppress a[d],modifie na--

diff --git a/src/BRepTest/BRepTest_TopologyCommands.cxx b/src/BRepTest/BRepTest_TopologyCommands.cxx
index a03f7b942fa7a92a52ddd87b24b2952e377f032a..b153e72055ba91a26cb4df55bd7cd0b6917c9bc5 100644 (file)
--- a/src/BRepTest/BRepTest_TopologyCommands.cxx
+++ b/src/BRepTest/BRepTest_TopologyCommands.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <BRepTest.hxx>
 #include <DBRep.hxx>
 #include <Draw_Interpretor.hxx>
@@ -49,10 +46,6 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopExp.hxx>
 
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
 //=======================================================================
 // topop
 //=======================================================================

diff --git a/src/DBRep/DBRep.cxx b/src/DBRep/DBRep.cxx
index 944ef26bc11428b82dd2ffeb0d6b8f879f3ca83e..b89e2bd417d170478f9fb542bb66dc39fd99f519 100644 (file)
--- a/src/DBRep/DBRep.cxx
+++ b/src/DBRep/DBRep.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <DBRep.ixx>
 #include <DBRep_DrawableShape.hxx>
 #include <Draw_Appli.hxx>
@@ -50,14 +46,10 @@
 
 // memory management
 #include <Standard.hxx>
-//#ifdef WNT
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 extern Draw_Viewer dout;
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 #define Characters(IArg) (strspn (Arg[IArg], "0123456789.+-eE") != strlen (Arg[IArg]))
 #define Float(IArg)      (strspn (Arg[IArg], "0123456789+-")    != strlen (Arg[IArg]))

diff --git a/src/Draw/Draw.cxx b/src/Draw/Draw.cxx
index 7884ee3eba3f6cade7c171614eae1ac46b741c4e..ed04b5f8fca2329170241383f171745056ef0e34 100644 (file)
--- a/src/Draw/Draw.cxx
+++ b/src/Draw/Draw.cxx
@@ -14,38 +14,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <Draw.ixx>
 
-#if defined(HAVE_TIME_H) || defined(WNT)
-# include <time.h>
-#endif
-
 #include <Draw_Appli.hxx>
 #include <OSD.hxx>
 #include <OSD_Environment.hxx>
 #include <OSD_Timer.hxx>
 
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-
 #include <Draw_Window.hxx>
 #include <gp_Pnt2d.hxx>
 

diff --git a/src/Draw/Draw_BasicCommands.cxx b/src/Draw/Draw_BasicCommands.cxx
index 00a54923127f17d9fe165bad4f259dc67402bd3e..4296fa5fd6620f8bcec76c56f268fe6329533f08 100644 (file)
--- a/src/Draw/Draw_BasicCommands.cxx
+++ b/src/Draw/Draw_BasicCommands.cxx
@@ -51,26 +51,7 @@ static clock_t CPU_CURRENT; // cpu time already used at last
 #else /* _WIN32 */
 
 #include <sys/resource.h>
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#if defined(HAVE_TIME_H)
-# include <time.h>
-#endif
-
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-
-#ifdef HAVE_SYS_SIGNAL_H
-# include <sys/signal.h>
-#endif
+#include <signal.h>
 
 #if defined (__hpux) || defined ( HPUX )
 #define RLIM_INFINITY   0x7fffffff

diff --git a/src/Draw/Draw_GraphicCommands.cxx b/src/Draw/Draw_GraphicCommands.cxx
index 983de89b3c3a7403d9a596d33925e64dea809511..328b57b79d952db0cbdb488b8e1c4238f9847885 100644 (file)
--- a/src/Draw/Draw_GraphicCommands.cxx
+++ b/src/Draw/Draw_GraphicCommands.cxx
@@ -18,10 +18,6 @@
 
 
 // Modif : DFO 05/11/96
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <Draw.ixx>
 #include <Draw_Appli.hxx>
 
@@ -34,13 +30,10 @@
 #include <Standard_Stream.hxx>
 
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 extern Draw_Viewer dout;
 extern Standard_Boolean Draw_Batch;
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 extern Standard_Boolean Draw_BlackBackGround;
 

diff --git a/src/Draw/Draw_Interpretor.cxx b/src/Draw/Draw_Interpretor.cxx
index 116d555bb1d99a8e32eff22e9db3be9531cd3931..bbceedfd14caad881cf93bd723378fb584fb323c 100644 (file)
--- a/src/Draw/Draw_Interpretor.cxx
+++ b/src/Draw/Draw_Interpretor.cxx
@@ -29,14 +29,14 @@
 
 #include <string.h>
 #include <tcl.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
 
 // for capturing of cout and cerr (dup(), dup2())
 #ifdef _MSC_VER
 #include <io.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 #if ! defined(STDOUT_FILENO)
 #define STDOUT_FILENO fileno(stdout)

diff --git a/src/Draw/Draw_Main.cxx b/src/Draw/Draw_Main.cxx
index b2eb7653d38f876d51fcc429b69b97f369dfec72..c63bc69d138e0f4fa73e6f129c4071f60f8ba2a8 100644 (file)
--- a/src/Draw/Draw_Main.cxx
+++ b/src/Draw/Draw_Main.cxx
@@ -41,17 +41,7 @@
 // - Standard_IMPOR is differently defined,
 // - Draw_Appli is differently declared.
 
-
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-  
-#ifdef WNT
+#ifdef _WIN32
 #include <windows.h> /* SW_SHOW */
 #endif
 

diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx
index e94de8fea99f5e77ad780128f7b130387aeb363e..be7f061d01206f52e771d0e37bbd109083b7dd07 100644 (file)
--- a/src/Draw/Draw_VariableCommands.cxx
+++ b/src/Draw/Draw_VariableCommands.cxx
@@ -15,9 +15,6 @@
 // commercial license or contractual agreement.
 
 #include <Draw.ixx>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #include <Standard_Stream.hxx>
 #include <Standard_SStream.hxx>
@@ -36,12 +33,9 @@
 
 #include <ios>
 
-#ifdef WNT
+#ifdef _WIN32
 extern Draw_Viewer dout;
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 #include <tcl.h>
 #include <errno.h>

diff --git a/src/Draw/Draw_Window.cxx b/src/Draw/Draw_Window.cxx
index 8d102b8dfbe95432dffb240fd7eaefc2dd95c204..7b9208e3e4f45e4cebdf28983fc8b4f5a513e15f 100644 (file)
--- a/src/Draw/Draw_Window.cxx
+++ b/src/Draw/Draw_Window.cxx
@@ -94,43 +94,9 @@ defaultPrompt:
 
 #if !defined(_WIN32) && !defined(__WIN32__)
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <OSD_Timer.hxx>
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#else
-#include <sys/ioctl.h>
-#endif
-
-#include <fcntl.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #include <Draw_Window.hxx>
-
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#include <stdio.h>
+#include <unistd.h>
 
 #if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
   // use forward declaration for small subset of used Tk functions

diff --git a/src/DrawTrSurf/DrawTrSurf.cxx b/src/DrawTrSurf/DrawTrSurf.cxx
index eeef95762b53e5a318e4726f5eb77973cee283c2..3b2c4abf16aa896bf12ce328784fcb6216b6b256 100644 (file)
--- a/src/DrawTrSurf/DrawTrSurf.cxx
+++ b/src/DrawTrSurf/DrawTrSurf.cxx
@@ -14,20 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_IOS
-# include <ios>
-#elif defined(HAVE_IOS_H)
-# include <ios.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
 #include <Standard_Stream.hxx>
 
 #include <Draw_Color.hxx>
@@ -1741,7 +1727,7 @@ static void pntsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
 {
   Handle(DrawTrSurf_Point) 
     N = Handle(DrawTrSurf_Point)::DownCast(d);
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   ios::fmtflags F = OS.flags();
   OS.setf(ios::scientific,ios::floatfield);
   OS.precision(15);
@@ -1758,7 +1744,7 @@ static void pntsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
     OS << "0 ";
     OS << P.X() << " " << P.Y() << "\n";
   }
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   OS.setf(F);
 #else
   OS.setf(form);
@@ -1803,7 +1789,7 @@ static void triasave(const Handle(Draw_Drawable3D)&d, ostream& OS)
 {
   Handle(DrawTrSurf_Triangulation) 
     T = Handle(DrawTrSurf_Triangulation)::DownCast(d);
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   ios::fmtflags F = OS.flags();
   OS.setf(ios::scientific,ios::floatfield);
   OS.precision(15);
@@ -1812,7 +1798,7 @@ static void triasave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   std::streamsize prec = OS.precision(15);
 #endif
   Poly::Write(T->Triangulation(),OS);
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   OS.setf(F);
 #else
   OS.setf(form);
@@ -1844,7 +1830,7 @@ static void poly3dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
 {
   Handle(DrawTrSurf_Polygon3D) 
     T = Handle(DrawTrSurf_Polygon3D)::DownCast(d);
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   ios::fmtflags F = OS.flags();
   OS.setf(ios::scientific,ios::floatfield);
   OS.precision(15);
@@ -1853,7 +1839,7 @@ static void poly3dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   std::streamsize prec = OS.precision(15);
 #endif
   Poly::Write(T->Polygon3D(),OS);
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   OS.setf(F);
 #else
   OS.setf(form);
@@ -1884,7 +1870,7 @@ static void poly2dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
 {
   Handle(DrawTrSurf_Polygon2D) 
     T = Handle(DrawTrSurf_Polygon2D)::DownCast(d);
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   ios::fmtflags F = OS.flags();
   OS.setf(ios::scientific, ios::floatfield);
   OS.precision(15);
@@ -1893,7 +1879,7 @@ static void poly2dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   std::streamsize prec = OS.precision(15);
 #endif
   Poly::Write(T->Polygon2D(),OS);
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   OS.setf(F);
 #else
   OS.setf(form);

diff --git a/src/DrawTrSurf/DrawTrSurf_Point.cxx b/src/DrawTrSurf/DrawTrSurf_Point.cxx
index 9c93a255e5994e93b948a67841fae35e68ce8070..9b09b9ae428dc28a0ab3343496417a99cd3e27cf 100644 (file)
--- a/src/DrawTrSurf/DrawTrSurf_Point.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Point.cxx
@@ -14,16 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_IOS
-# include <ios>
-#elif defined(HAVE_IOS_H)
-# include <ios.h>
-#endif
-
 #include <DrawTrSurf_Point.ixx>
 #include <Standard_Stream.hxx>
 
@@ -186,7 +176,7 @@ Handle(Draw_Drawable3D) DrawTrSurf_Point::Copy() const
 
 void DrawTrSurf_Point::Dump(Standard_OStream& S) const 
 {
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   ios::fmtflags F = S.flags();
   S.setf(ios::scientific,ios::floatfield);
   S.precision(15);
@@ -198,7 +188,7 @@ void DrawTrSurf_Point::Dump(Standard_OStream& S) const
     S << "Point : " << myPoint.X() << ", " << myPoint.Y() << ", " << myPoint.Z() <<endl;
   else
     S << "Point 2d : " << myPoint.X() << ", " << myPoint.Y() <<endl;
-#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
+#if !defined(_WIN32) && !defined(__sgi) && !defined(IRIX)
   S.setf(F);
 #else
   S.setf(form);

diff --git a/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx b/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx
index 199e044083690faadf32b3b30c3fd50457d7c5f1..31949705f3ea635d16a2cd84ab34022adcc5aaeb 100644 (file)
--- a/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx
+++ b/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <GeomliteTest.hxx>
 #include <DrawTrSurf.hxx>
 #include <Draw.hxx>
@@ -86,13 +83,10 @@
 
 //#ifdef WNT
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 //#define strcasecmp strcmp Already defined
 Standard_IMPORT Draw_Viewer dout;
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 
 

diff --git a/src/Graphic3d/Graphic3d_Structure.pxx b/src/Graphic3d/Graphic3d_Structure.pxx
index 41538693f1681ce68cbc9477f0e8e0c1d6795187..a9fb02e64c4a990618a9d569a98472aa6f8b2cbd 100644 (file)
--- a/src/Graphic3d/Graphic3d_Structure.pxx
+++ b/src/Graphic3d/Graphic3d_Structure.pxx
@@ -15,20 +15,6 @@
 #ifndef STRUCTURE_PXX_INCLUDED
 #define STRUCTURE_PXX_INCLUDED
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_LIMITS
-# include <limits>
-#elif defined (HAVE_LIMITS_H)
-# include <limits.h>
-#endif
-
-#ifdef WNT
-# include <limits>
-#endif
-
 // structure priority : range (do not change this range !)
 // call_togl_displaystructure, CALL_DEF_VIEW, MajView ...
 #define Structure_MAX_PRIORITY 10

diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx
index 8a8739b787b0adb69513be5d5ca54c7c45b79c25..fe573f6da458636d3a39d9c052730d5ebd95e7c2 100644 (file)
--- a/src/Image/Image_AlienPixMap.cxx
+++ b/src/Image/Image_AlienPixMap.cxx
@@ -13,10 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #ifdef HAVE_FREEIMAGE
   #include <FreeImage.h>
 

diff --git a/src/OSD/OSD.cxx b/src/OSD/OSD.cxx
index 572a123f397519a74a2aa899c84bf9eb34f70855..24478abf266e2d6edaedbfbb7fa6f6736ee8b8f4 100644 (file)
--- a/src/OSD/OSD.cxx
+++ b/src/OSD/OSD.cxx
@@ -16,10 +16,7 @@
 #include <Standard_Stream.hxx>
 #include <stdio.h>
 #include <math.h>
-#if HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-#if !defined(HAVE_FINITE) && defined(isfinite)
+#if defined(isfinite)
 # define finite isfinite
 #endif
 
@@ -82,13 +79,8 @@ Standard_Boolean OSD::CStringToReal(const Standard_CString aString,
 #else
 # define SLEEP(NSEC)                 sleep(NSEC)
 #endif
-
-#ifdef HAVE_VALUES_H
-//# include <values.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+#ifndef _WIN32
+#include <unistd.h>
 #endif
 
 void OSD::SecSleep(const Standard_Integer aDelay)
@@ -101,7 +93,7 @@ void OSD::SecSleep(const Standard_Integer aDelay)
 //purpose  : Cause the process to sleep during a amount of milliseconds  
 //=======================================================================
 
-#ifdef WNT
+#ifdef _WIN32
 
 void OSD::MilliSecSleep(const Standard_Integer aDelay)
 {
@@ -110,9 +102,7 @@ void OSD::MilliSecSleep(const Standard_Integer aDelay)
 
 #else
 
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+#include <sys/time.h>
 
 void OSD::MilliSecSleep(const Standard_Integer aDelay)
 {

diff --git a/src/OSD/OSD_Chronometer.cxx b/src/OSD/OSD_Chronometer.cxx
index 900e91c847ac17b8cf43641ade45e693498acc47..99b4e284a5c95c6b0d563c8aade051b2e9e855d6 100644 (file)
--- a/src/OSD/OSD_Chronometer.cxx
+++ b/src/OSD/OSD_Chronometer.cxx
@@ -23,21 +23,8 @@
 
 //---------- Systemes autres que WNT : ----------------------------------
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
+#include <sys/times.h>
+#include <unistd.h>
 
 #ifdef SOLARIS
 # include <sys/resource.h>
@@ -51,7 +38,7 @@
 # define _sysconf sysconf
 #endif
 
-#if defined(HAVE_TIME_H) || defined(WNT) || defined(DECOSF1)
+#if defined(DECOSF1)
 # include <time.h>
 #endif
 
@@ -59,12 +46,6 @@
 #   define CLK_TCK     CLOCKS_PER_SEC
 #  endif
 
-#ifdef HAVE_LIMITS
-# include <limits>
-#elif defined (HAVE_LIMITS_H)
-# include <limits.h>
-#endif
-
 #if (defined(__APPLE__))
   #include <mach/task.h>
   #include <mach/mach.h>

diff --git a/src/OSD/OSD_Directory.cxx b/src/OSD/OSD_Directory.cxx
index bfdd8b11ce704a6c2f81092419bd599dd446199e..f64da88aae46492b3aa8736b8f021de93a254229 100644 (file)
--- a/src/OSD/OSD_Directory.cxx
+++ b/src/OSD/OSD_Directory.cxx
@@ -12,39 +12,16 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef WNT
 
 #include <OSD_Directory.ixx>
 #include <OSD_WhoAmI.hxx>
 #include <OSD_Protection.hxx>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>   // For getwd()
-#endif
-
+#include <sys/stat.h>
 #include <errno.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #include <stdio.h>
-
-#ifdef HAVE_OSFCN_H
-# include <osfcn.h>
-#endif
+#include <unistd.h>
 
 const OSD_WhoAmI Iam = OSD_WDirectory;
 

diff --git a/src/OSD/OSD_DirectoryIterator.cxx b/src/OSD/OSD_DirectoryIterator.cxx
index b8924ea5df0adc2d65c1053de517c4589b84bd6c..d33cbc4547c2bb07dc001d57978df79eb623a678 100644 (file)
--- a/src/OSD/OSD_DirectoryIterator.cxx
+++ b/src/OSD/OSD_DirectoryIterator.cxx
@@ -12,28 +12,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef WNT
 
 #include <OSD_DirectoryIterator.ixx>
 #include <OSD_WhoAmI.hxx>
 
 #include <stdio.h>
-
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <dirent.h>
+#include <sys/stat.h>
 
 //const OSD_WhoAmI Iam = OSD_WDirectoryIterator;
 

diff --git a/src/OSD/OSD_Disk.cxx b/src/OSD/OSD_Disk.cxx
index 9421127c46626385e0601ae28304e37af34d0c49..967600442007bd78cf2b4bdffd2889cbc952166e 100644 (file)
--- a/src/OSD/OSD_Disk.cxx
+++ b/src/OSD/OSD_Disk.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef WNT
 
 #include <OSD_Disk.ixx>
@@ -27,17 +23,7 @@ const OSD_WhoAmI Iam = OSD_WDisk;
 extern "C" {
 #endif
 
-  //#include <sys/types.h>
-
-#if defined(HAVE_STATVFS) && defined(HAVE_SYS_STATVFS_H)
-# include <sys/statvfs.h>
-#elif defined(HAVE_STATFS) && defined(HAVE_SYS_VFS_H)
-  // Note: we want to use the "vfs" method on HP, not elsewhere
-# include <sys/vfs.h>
-#elif defined(HAVE_STATFS)
-# include <sys/param.h>
-# include <sys/mount.h>
-#endif
+#include <sys/statvfs.h>
 
 #ifdef __cplusplus
 }
@@ -45,9 +31,7 @@ extern "C" {
 
 #include <errno.h>
 
-#if defined(HAVE_STATVFS)
 extern "C" {int statvfs(const char *, struct statvfs *); }
-#endif
 
 OSD_Disk::OSD_Disk() : myQuotaSize(0) {}
 
@@ -76,18 +60,6 @@ OSD_Path OSD_Disk::Name()const{
 
 Standard_Integer OSD_Disk::DiskSize(){
 
-#if !defined(HAVE_STATVFS)
-
-struct statfs buffer;
-  if ( statfs (DiskName.ToCString(),&buffer) == 0 ){
-    long BSize512 = buffer.f_bsize / 512 ;
-    return buffer.f_blocks * BSize512 ;
-  }
-  else {
-    myError.SetValue(errno, Iam, "OSD_Disk: statfs failed.");
-
-#else
-
 struct statvfs buffer;
 
   if ( statvfs(DiskName.ToCString(),&buffer) == 0 ){
@@ -96,28 +68,10 @@ struct statvfs buffer;
   }
   else {
     myError.SetValue(errno, Iam, "OSD_Disk: statvfs failed.");
-
-#endif
     return 0;
   }
 }
 
-#if !defined(HAVE_STATVFS)
-Standard_Integer OSD_Disk::DiskFree(){
-
-struct statfs buffer;
-  if ( statfs (DiskName.ToCString(),&buffer) == 0 ){
-    long BSize512 = buffer.f_bsize / 512 ;
-    return buffer.f_bavail * BSize512 ;
-  }
-  else {
-    myError.SetValue(errno, Iam, "OSD_Disk: statfs failed.");
-    return 0;
-  }
-}
-
-#else
-
 Standard_Integer OSD_Disk::DiskFree(){
 
 struct statvfs buffer;
@@ -131,8 +85,6 @@ struct statvfs buffer;
   }
 }
 
-#endif
-
 Standard_Integer OSD_Disk::DiskQuota(){
 //@@@ A faire
 return 0;

diff --git a/src/OSD/OSD_File.cxx b/src/OSD/OSD_File.cxx
index e94a8c82d14a79a7a0ab368b8ef5c5b5c4df6c69..afb4ee837ac8892c3b73121426eaa4e83876ce85 100644 (file)
--- a/src/OSD/OSD_File.cxx
+++ b/src/OSD/OSD_File.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 //------------------------------------------------------------------------
 //                    UNIX Part
 //------------------------------------------------------------------------
@@ -39,22 +35,11 @@ const OSD_WhoAmI Iam = OSD_WFile;
 #endif
 
 #include <errno.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <unistd.h>
+#include <sys/stat.h>
 
 #define NEWLINE '\10';
 

diff --git a/src/OSD/OSD_FileIterator.cxx b/src/OSD/OSD_FileIterator.cxx
index 106c7bdcf7fd2894d537cd059fdb5f59c25d21b8..d6b9b1117cb5cb50cdb3a9ad26045d579ed6aedd 100644 (file)
--- a/src/OSD/OSD_FileIterator.cxx
+++ b/src/OSD/OSD_FileIterator.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef WNT
 
 #include <OSD_FileIterator.ixx>
@@ -25,28 +21,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 # ifdef VMS
 extern char *vmsify PARAMS ((char *name, int type));
 # endif
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-# ifdef HAVE_VMSDIR_H
-#  include "vmsdir.h"
-# endif /* HAVE_VMSDIR_H */
-#endif
 
 /* In GNU systems, <dirent.h> defines this macro for us.  */
 #ifdef _D_NAMLEN

diff --git a/src/OSD/OSD_FileNode.cxx b/src/OSD/OSD_FileNode.cxx
index a2bc09ca64878cb70c582045f939e1cd85d3a40b..98f123ff2a8693fca0734f98df5390777ac3fd1c 100644 (file)
--- a/src/OSD/OSD_FileNode.cxx
+++ b/src/OSD/OSD_FileNode.cxx
@@ -12,19 +12,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef _WIN32
 
 //----------------------------------------------------------------------------
 //------------------- Linux Sources of OSD_FileNode --------------------------
 //----------------------------------------------------------------------------
 
-#include <unistd.h>
 #include <errno.h>
-#include <string.h>
 
 #include <Standard_ProgramError.hxx>
 #include <OSD_OSDError.hxx>
@@ -32,34 +26,13 @@
 #include <OSD_WhoAmI.hxx>
 #include <OSD_FileNode.ixx>
 
-#if!defined(TM_IN_SYS_TIME) && defined(HAVE_TIME_H)
-# include <time.h>
-#elif HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>  // for "stat"
-#endif
-
 #include <stdlib.h>    // For "system"
 #include <errno.h>
 #include <fcntl.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #include <stdio.h>
-
-#ifdef HAVE_OSFCN_H
-# include <osfcn.h>
-#endif
-
+#include <unistd.h>
+#include <sys/stat.h>
 
 const OSD_WhoAmI Iam = OSD_WFileNode;
 

diff --git a/src/OSD/OSD_Host.cxx b/src/OSD/OSD_Host.cxx
index 536305759adfd91ee88058e0d1af32646934a9b4..da086d42a4ba143ef4f16843b101e7199d116876 100644 (file)
--- a/src/OSD/OSD_Host.cxx
+++ b/src/OSD/OSD_Host.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef WNT
 
 #include <Standard_NullObject.hxx>
@@ -27,20 +23,11 @@ const OSD_WhoAmI Iam = OSD_WHost;
 
 #include <errno.h>
 
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h> // For 'uname'
-#endif
-
-#ifdef HAVE_NETDB_H
-# include <netdb.h>       // This is for 'gethostbyname'
-#endif
-
+#include <sys/utsname.h> // For 'uname'
+#include <netdb.h>       // This is for 'gethostbyname'
+#include <unistd.h>
 #include <stdio.h>
 
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
-
 #if defined(__osf__) || defined(DECOSF1)
 #include <sys/types.h>
 #include <sys/sysinfo.h>  // For 'getsysinfo'
@@ -52,26 +39,6 @@ extern "C" {
 }
 #endif
 
-#ifdef HAVE_SYSENT_H
-# include <sysent.h>      // for 'gethostname'
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-
-#ifdef HAVE_SYS_UNISTD_H
-# include <sys/unistd.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_SYSTEMINFO_H
-# include <sys/systeminfo.h>
-#endif
-
 extern "C" {int sysinfo(int, char *, long);}
 
 
@@ -84,22 +51,11 @@ OSD_Host::OSD_Host(){}
 TCollection_AsciiString OSD_Host::SystemVersion(){
 struct utsname info;
 TCollection_AsciiString result;
-#ifdef HAVE_SYS_SYSTEMINFO_H
-char buf[100];
-#endif
 
  uname (&info);
  result  = info.sysname;
  result += " ";
  result += info.release;
-#ifdef HAVE_SYS_SYSTEMINFO_H
- result += " ";
- sysinfo(SI_ARCHITECTURE,buf,99);
- result += buf;
- result += " ";
- sysinfo(SI_HW_PROVIDER,buf,99);
- result += buf;
-#endif
  return(result);
 }
 

diff --git a/src/OSD/OSD_Path.cxx b/src/OSD/OSD_Path.cxx
index 97ca76255c42bfe9c895cac25a2e2f90ae939806..0fbde8bfc1a579f31f1ca0c5fbbd6dd3c4d5b122 100644 (file)
--- a/src/OSD/OSD_Path.cxx
+++ b/src/OSD/OSD_Path.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef WNT
 
 #include <Standard_NumericError.hxx>
@@ -25,10 +21,6 @@
 #include <OSD_Path.ixx>
 #include <OSD_WhoAmI.hxx>
 
-#ifdef HAVE_SYS_UTSNAME_H
-//# include <sys/utsname.h>
-#endif
-
 static OSD_SysType whereAmI(){
 #if defined(__digital__) || defined(__FreeBSD__) || defined(SUNOS) || defined(__APPLE__)
   return OSD_UnixBSD;

diff --git a/src/OSD/OSD_Process.cxx b/src/OSD/OSD_Process.cxx
index 2cfdff3efe8f7c787bd0b196055de566832631a1..2a6daf622c118b3b4f3c1e524beb6d94fdb619a9 100644 (file)
--- a/src/OSD/OSD_Process.cxx
+++ b/src/OSD/OSD_Process.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef WNT
 
 #include <OSD_Process.ixx>
@@ -25,28 +21,11 @@
 const OSD_WhoAmI Iam = OSD_WProcess;
 
 #include <errno.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #include <stdlib.h>
-
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
-#if defined(HAVE_TIME_H) || defined(WNT)
-# include <time.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_PWD_H
-# include <pwd.h>       // For command getpwuid
-#endif
+#include <sys/param.h>
+#include <sys/time.h>
+#include <pwd.h>       // For command getpwuid
+#include <unistd.h>
 
 OSD_Process::OSD_Process(){
 }

diff --git a/src/OSD/OSD_SharedLibrary.cxx b/src/OSD/OSD_SharedLibrary.cxx
index b42792498cd0c408dc2300a2f921e8966b89d0ef..db201cb9f88876e5ca5309c518c4c6aaafad4eed 100644 (file)
--- a/src/OSD/OSD_SharedLibrary.cxx
+++ b/src/OSD/OSD_SharedLibrary.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef WNT
 
 #include <OSD_LoadMode.hxx>
@@ -24,10 +20,6 @@
 
 #include <stdio.h>
 
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#endif
-
 #ifdef __some_crappy_system__
 /*
  * Values for 'mode' argument in dlopen().
@@ -49,13 +41,7 @@ extern "C" {int     dlclose (       void  *handle  );}
 extern "C" {void    *dlerror (void);}
 #endif
 
-#ifdef HAVE_DLFCN_H
-# include <dlfcn.h>
-#endif
-
-#ifdef HAVE_DL_H
-# include <dl.h>
-#endif
+#include <dlfcn.h>
 
 extern "C" {size_t  strlen  (const  char*  s      );}
 
@@ -125,25 +111,12 @@ void  OSD_SharedLibrary::SetName(const Standard_CString aName)  {
 //
 // ----------------------------------------------------------------
 Standard_Boolean  OSD_SharedLibrary::DlOpen(const OSD_LoadMode aMode ) {
-
-#ifdef HAVE_DL_H
-if (aMode == OSD_RTLD_LAZY){
-//  myHandle = cxxshl_load(myName, BIND_FIRST | BIND_TOGETHER | BIND_DEFERRED | BIND_VERBOSE | DYNAMIC_PATH, 0L);
-  myHandle = shl_load(myName, BIND_FIRST | BIND_TOGETHER | BIND_DEFERRED | BIND_VERBOSE | DYNAMIC_PATH, 0L);
-}
-else if (aMode == OSD_RTLD_NOW){
-//  myHandle = cxxshl_load(myName, BIND_FIRST | BIND_TOGETHER | BIND_IMMEDIATE | BIND_VERBOSE | DYNAMIC_PATH, 0L);
-  myHandle = shl_load(myName, BIND_FIRST | BIND_TOGETHER | BIND_IMMEDIATE | BIND_VERBOSE | DYNAMIC_PATH, 0L);
-
-}
-#else
 if (aMode == OSD_RTLD_LAZY){
   myHandle = dlopen (myName,RTLD_LAZY);
 }
 else if (aMode == OSD_RTLD_NOW){
   myHandle = dlopen (myName,RTLD_NOW);
 }
-#endif
 
 if (!BAD(myHandle)){
   return Standard_True;
@@ -161,8 +134,6 @@ else {
 //
 // ----------------------------------------------------------------
 OSD_Function  OSD_SharedLibrary::DlSymb(const Standard_CString aName )const{
-
-#ifndef HAVE_DL_H
 void (*fp)();
 fp =  (void (*)()) dlsym (myHandle,aName);
 if (!BAD(fp)){
@@ -171,20 +142,6 @@ if (!BAD(fp)){
 else {
   return (OSD_Function)NULL;
  }
-#else
-  void *adr_get = NULL;
-//  shl_t handlesym=0 ;
-
-  errno = 0 ;
-  //  if (  shl_findsym( &handlesym,aName,TYPE_PROCEDURE,&adr_get) == -1 ) {
-  if ( shl_findsym((shl_t *)&myHandle,aName,TYPE_PROCEDURE,&adr_get) == -1 ) {
-    if ( errno != 0 )
-      perror("OSD_SharedLibrary : shl_findsym perror : ") ;
-    return (OSD_Function)NULL;
-  }
-  else return (OSD_Function) adr_get;
-#endif
-
 }
 // ----------------------------------------------------------------
 //
@@ -195,13 +152,7 @@ else {
 //
 // ----------------------------------------------------------------
 void OSD_SharedLibrary::DlClose()const{
-
-#ifndef HAVE_DL_H
  dlclose(myHandle);
-#else
- shl_unload((shl_t)myHandle);
-#endif
-
 }
 // ----------------------------------------------------------------
 //
@@ -210,12 +161,7 @@ void OSD_SharedLibrary::DlClose()const{
 //
 // ----------------------------------------------------------------
 Standard_CString OSD_SharedLibrary::DlError()const{
-#ifndef HAVE_DL_H
 return (char*) dlerror();
-#else
-perror("shl_load, shl_findsym, or shl_unload : perror : ") ;
-return (char*) errno;
-#endif
 }
 // ----------------------------------------------------------------------------
 // Destroy

diff --git a/src/OSD/OSD_Timer.cxx b/src/OSD/OSD_Timer.cxx
index 9373c11e7699f80e92df22e58fe68668e97d8b4c..ef8773f2ba15d1af9381151fed74cf75eee4f58b 100644 (file)
--- a/src/OSD/OSD_Timer.cxx
+++ b/src/OSD/OSD_Timer.cxx
@@ -19,19 +19,13 @@
 //         system call gettimeofday. This function is portable and give us
 //         elapsed time in seconds and microseconds.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <OSD_Timer.ixx>
 
 #ifndef WNT
 
 //---------- No Windows NT Systems ----------------------------------
 
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+#include <sys/time.h>
 
 //=======================================================================
 //function : GetWallClockTime

diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx
index 31d362b9140c2feb7f8e04b5ff177ea1476f3a39..249aede8e1c9a6adad5130d84ed856c615365bd0 100644 (file)
--- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx
@@ -17,10 +17,6 @@
 
 //---------- All Systems except Windows NT : ----------------------------------
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 # include <stdio.h>
 
 #include <OSD_WhoAmI.hxx>
@@ -40,16 +36,7 @@
 #include <Standard_ErrorHandler.hxx>
 
 // POSIX threads
-#ifdef HAVE_PTHREAD_H
- #include <pthread.h>
-#endif
-
-#ifdef HAVE_PTHREAD_H
-static pthread_t getOCCThread () {
-  static pthread_t TheOCCThread = 0;
-  return TheOCCThread ;
-}
-#endif
+#include <pthread.h>
 
 #ifdef linux
 #include <fenv.h>
@@ -64,38 +51,10 @@ static Standard_Boolean fCtrlBrk;
 typedef void (ACT_SIGIO_HANDLER)(void) ;
 ACT_SIGIO_HANDLER *ADR_ACT_SIGIO_HANDLER = NULL ;
 
-#if defined(HAVE_FLOATINGPOINT_H) && defined(HAVE_SYS_MACHSIG_H)
-# include <floatingpoint.h>
-# include <sys/machsig.h>
-// JPT : Difference between SUN/SUNOS and SUN/SOLARIS 
-# 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 
-
-#define        FPE_FLTRES_TRAP FPE_FLTRES      /* floating point inexact result */
-#define        FPE_FLTINV_TRAP FPE_FLTINV      /* invalid floating point operation */
-#define        FPE_FLTSUB_TRAP FPE_FLTSUB      /* subscript out of range */
-
-extern "C" {int ieee_handler(char *,char *, sigfpe_handler_type&);}
-# include <stdlib.h>
-#endif
-
 #ifdef DECOSF1
 typedef void (* SIG_PFV) (int);
 #endif
 
-#if defined(HAVE_SIGFPE_H) && defined(HAVE_SYS_SIGINFO_H)
-# include <sigfpe.h>
-# 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 
-
 #ifdef __GNUC__
 # include <stdlib.h>
 # include <stdio.h>
@@ -108,13 +67,8 @@ typedef void (* SIG_PFV) (int);
 #endif
 typedef void (* SIG_PFV) (int);
 
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-
-#ifdef HAVE_SYS_SIGNAL_H
-# include <sys/signal.h>
-#endif
+#include <signal.h>
+#include <sys/signal.h>
 
 #if defined(HAVE_PTHREAD_H) && defined(NO_CXX_EXCEPTION) 
 //============================================================================

diff --git a/src/OpenGl/OpenGl_GraduatedTrihedron.cxx b/src/OpenGl/OpenGl_GraduatedTrihedron.cxx
index a0a3af968c9b14760cc273673282fc3472183fa6..067140b33ec86822dae11d0b89567a25a7bda01c 100755 (executable)
--- a/src/OpenGl/OpenGl_GraduatedTrihedron.cxx
+++ b/src/OpenGl/OpenGl_GraduatedTrihedron.cxx
@@ -24,10 +24,7 @@
 #include <InterfaceGraphic_Aspect.hxx>
 #include <InterfaceGraphic_Visual3d.hxx>
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-#ifdef HAVE_STRING_H
+#ifndef _WIN32
   #include <string.h>
 #endif
 

diff --git a/src/OpenGl/OpenGl_GraphicDriver.cxx b/src/OpenGl/OpenGl_GraphicDriver.cxx
index e7f868960a104204486454593c7aafdad06413a3..9e9003e1dbc280300caf8279032fa3b78471b2b8 100755 (executable)
--- a/src/OpenGl/OpenGl_GraphicDriver.cxx
+++ b/src/OpenGl/OpenGl_GraphicDriver.cxx
@@ -13,10 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #include <OpenGl_GraphicDriver.hxx>
 #include <OpenGl_Context.hxx>
 #include <OpenGl_Flipper.hxx>

diff --git a/src/OpenGl/OpenGl_GraphicDriver_Export.cxx b/src/OpenGl/OpenGl_GraphicDriver_Export.cxx
index 7b02825090c012eb6ec205c4ef9b4227c610f41b..abed43e79bbb59ddf813a89e69ef4131fa7760f6 100644 (file)
--- a/src/OpenGl/OpenGl_GraphicDriver_Export.cxx
+++ b/src/OpenGl/OpenGl_GraphicDriver_Export.cxx
@@ -17,10 +17,6 @@
 
 #include <Standard_CLocaleSentry.hxx>
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef HAVE_GL2PS
 #include <gl2ps.h>
 #endif

diff --git a/src/OpenGl/OpenGl_LineAttributes.cxx b/src/OpenGl/OpenGl_LineAttributes.cxx
index 27625db81665c1a22d16fa148debac9d641ec85f..adb984b3ac95bba91e635d21a3c30fde59d80942 100644 (file)
--- a/src/OpenGl/OpenGl_LineAttributes.cxx
+++ b/src/OpenGl/OpenGl_LineAttributes.cxx
@@ -18,10 +18,6 @@
 #include <OpenGl_LineAttributes.hxx>
 #include <OpenGl_Context.hxx>
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #ifdef HAVE_GL2PS
   #include <gl2ps.h>
 #endif

diff --git a/src/OpenGl/OpenGl_Text.cxx b/src/OpenGl/OpenGl_Text.cxx
index e8151fcd825189df093516d95f22c33a7ea3e62e..1d8da4141fe2418b33d3e613865753087c94edbf 100755 (executable)
--- a/src/OpenGl/OpenGl_Text.cxx
+++ b/src/OpenGl/OpenGl_Text.cxx
@@ -25,10 +25,6 @@
 #include <Font_FontMgr.hxx>
 #include <TCollection_HAsciiString.hxx>
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #ifdef HAVE_GL2PS
   #include <gl2ps.h>
 #endif

diff --git a/src/OpenGl/OpenGl_Workspace.cxx b/src/OpenGl/OpenGl_Workspace.cxx
index 29a931be08d2bcbcb6ace92ea5ad97e718099ecb..80d04093f68d5d335a5d3508868b3cae5e9e253b 100644 (file)
--- a/src/OpenGl/OpenGl_Workspace.cxx
+++ b/src/OpenGl/OpenGl_Workspace.cxx
@@ -13,10 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #include <OpenGl_GlCore15.hxx>
 
 #include <InterfaceGraphic.hxx>

diff --git a/src/OpenGl/OpenGl_Workspace_2.cxx b/src/OpenGl/OpenGl_Workspace_2.cxx
index 833bb3f8c586e4e6dbc7aeb68657205a9b875786..2195f7831047951cbd8bdf92c2a2a1780c4f3a96 100644 (file)
--- a/src/OpenGl/OpenGl_Workspace_2.cxx
+++ b/src/OpenGl/OpenGl_Workspace_2.cxx
@@ -19,10 +19,6 @@
 #include <TColStd_Array2OfReal.hxx>
 #include <OpenGl_telem_util.hxx>
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #if (defined(_WIN32) || defined(__WIN32__)) && defined(HAVE_FREEIMAGE)
   #include <NCollection_Handle.hxx>
   #include <FreeImagePlus.h>

diff --git a/src/OpenGl/OpenGl_Workspace_5.cxx b/src/OpenGl/OpenGl_Workspace_5.cxx
index b7a3d11569c9421bdce1f3ce28ef87a26671aa5e..d952455e6c8173d883ac77b60586ba8728f42e6a 100644 (file)
--- a/src/OpenGl/OpenGl_Workspace_5.cxx
+++ b/src/OpenGl/OpenGl_Workspace_5.cxx
@@ -25,10 +25,6 @@
 #include <OpenGl_ShaderManager.hxx>
 #include <OpenGl_telem_util.hxx>
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 /* OCC22218 NOTE: project dependency on gl2ps is specified by macro */
 #ifdef HAVE_GL2PS
   #include <gl2ps.h>

diff --git a/src/PCollection/PCollection_HAsciiString.cxx b/src/PCollection/PCollection_HAsciiString.cxx
index 0cd41dbe8fc71c5c3424226aefa6b01017bc8492..12bd5f7ac2a7ee6700ce70703170f193a6f7c5f8 100644 (file)
--- a/src/PCollection/PCollection_HAsciiString.cxx
+++ b/src/PCollection/PCollection_HAsciiString.cxx
@@ -19,19 +19,7 @@
 #include <Standard_NegativeValue.hxx>
 #include <Standard_OutOfRange.hxx>
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#if defined(HAVE_STRING_H)
-# include <string.h>
-#endif
 #include <stdio.h>
-#if defined(HAVE_STDLIB_H)
-# include <stdlib.h>
-#endif
-#if defined(HAVE_LIBC_H)
-# include <libc.h>
-#endif
 
 //------------------------------------
 //  Conversion functions and variables

diff --git a/src/PCollection/PCollection_HExtendedString.cxx b/src/PCollection/PCollection_HExtendedString.cxx
index 971c053b50e1c50a1362819bedc5fb011ef2b401..dda4259d6440ee3958fb9bb686700939b9c865be 100644 (file)
--- a/src/PCollection/PCollection_HExtendedString.cxx
+++ b/src/PCollection/PCollection_HExtendedString.cxx
@@ -19,19 +19,7 @@
 #include <Standard_NegativeValue.hxx>
 #include <Standard_OutOfRange.hxx>
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#if defined(HAVE_STRING_H)
-# include <string.h>
-#endif
 #include <stdio.h>
-#if defined(HAVE_STDLIB_H)
-#include <stdlib.h>
-#endif
-#if defined(HAVE_LIBC_H)
-# include <libc.h>
-#endif
 
 //------------------------------------------------------------------------
 //  Create from an ExtendedString of TCollection

diff --git a/src/QABugs/QABugs_3.cxx b/src/QABugs/QABugs_3.cxx
index fe4eed3817f219300e732d5e369ea64154c7a1f3..f3313bbcef7c4e3323428bae33de4b24b40859f9 100644 (file)
--- a/src/QABugs/QABugs_3.cxx
+++ b/src/QABugs/QABugs_3.cxx
@@ -14,9 +14,6 @@
 // commercial license or contractual agreement.
 
 #include <QABugs.hxx>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
 #include <TopLoc_Location.hxx>

diff --git a/src/STEPConstruct/STEPConstruct_AP203Context.cxx b/src/STEPConstruct/STEPConstruct_AP203Context.cxx
index d2d15d08fcceb639f2df11f5b395f8e223aa3ffa..2660fd24251b70c0b14f4a39861ce9ac1d42868b 100644 (file)
--- a/src/STEPConstruct/STEPConstruct_AP203Context.cxx
+++ b/src/STEPConstruct/STEPConstruct_AP203Context.cxx
@@ -14,28 +14,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <STEPConstruct_AP203Context.ixx>
 
-#ifdef HAVE_PWD_H
+#ifndef _WIN32
 # include <pwd.h>
-#endif
-
-#ifdef HAVE_NETDB_H
 # include <netdb.h>
-#endif
-
-#ifdef WNT
+#else
 # include <winsock2.h>
 #endif
 
-#if defined(HAVE_TIME_H) || defined(WNT)
-# include <time.h>
-#endif
-
 #include <stdio.h>
 
 #include <OSD_Process.hxx>

diff --git a/src/Standard/Standard_CLocaleSentry.cxx b/src/Standard/Standard_CLocaleSentry.cxx
index e585ff20286b4899b2a91e4a89da43850527d63d..e3c88da6704ecc74ef833565f1bb914e447f483a 100644 (file)
--- a/src/Standard/Standard_CLocaleSentry.cxx
+++ b/src/Standard/Standard_CLocaleSentry.cxx
@@ -13,10 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #include <Standard_CLocaleSentry.hxx>
 
 #include <Standard_TypeDef.hxx>

diff --git a/src/Standard/Standard_ExtString.cxx b/src/Standard/Standard_ExtString.cxx
index e3f246ea0074e556d14ee22be5c4b96631bc2cd1..e49b0371f6859f7ef7b2af729996baf2cbce9958 100644 (file)
--- a/src/Standard/Standard_ExtString.cxx
+++ b/src/Standard/Standard_ExtString.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <Standard_ExtString.hxx>
 #include <Standard_Type.hxx> 
 #include <Standard_OStream.hxx>

diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx
index 51a3423dea2fe69423dca1e83dc38ebc3a811b33..6f6b7d8e4a1eab906d5cedb08a090f0e96ed34a2 100644 (file)
--- a/src/Standard/Standard_MMgrOpt.cxx
+++ b/src/Standard/Standard_MMgrOpt.cxx
@@ -16,37 +16,15 @@
 #include <Standard_MMgrOpt.hxx>
 #include <Standard_OutOfMemory.hxx>
 #include <Standard_Assert.hxx>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #include <stdio.h>
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-
-#ifndef WNT
-# include <stdlib.h>
-# include <errno.h>
-#endif
-
-#ifdef WNT
-#include <windows.h>
+#ifdef _WIN32
+# include <windows.h>
 #else
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-# ifdef HAVE_SYS_MMAN_H
-#  include <sys/mman.h>    /* mmap() */
-# endif
+# include <sys/mman.h>    /* mmap() */
 #endif
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#endif
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+
 #include <fcntl.h>
 //
 #if defined (__sun) || defined(SOLARIS)

diff --git a/src/Standard/Standard_Macro.hxx b/src/Standard/Standard_Macro.hxx
index cc5d7260c7d029138a14b2e945dfaddb712177d7..9a47dd9085f0ae4dcac515c6f14820fa74112998 100644 (file)
--- a/src/Standard/Standard_Macro.hxx
+++ b/src/Standard/Standard_Macro.hxx
@@ -19,10 +19,6 @@
 #ifndef _Standard_Macro_HeaderFile
 # define _Standard_Macro_HeaderFile
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 // Standard OCC macros: Handle(), STANDARD_TYPE()
 # define   Handle(ClassName)      Handle_##ClassName
 # define   STANDARD_TYPE(aType)   aType##_Type_()

diff --git a/src/Standard/Standard_Type.cxx b/src/Standard/Standard_Type.cxx
index 1887a80c152037c715e4276dab0533f523be409a..ac7a9720b952f3f7be81c0d8c48baadb34f83c7b 100644 (file)
--- a/src/Standard/Standard_Type.cxx
+++ b/src/Standard/Standard_Type.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <Standard_Type.ixx>
 #include <Standard_Persistent.hxx>
 

diff --git a/src/Standard/Standard_values.h b/src/Standard/Standard_values.h
index fa39731eb11fe4442eac43f599ae942c2b8a04bb..696a7a5a2b7b72d7353f9db8a2c4d4912669b64a 100644 (file)
--- a/src/Standard/Standard_values.h
+++ b/src/Standard/Standard_values.h
@@ -21,23 +21,10 @@
 #error "Wrong compiler options has been detected. Add /DWNT option for proper compilation!!!!!"
 #endif
 
-#ifndef WNT
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_LIMITS
+#ifdef _WIN32
 # include <limits>
-#elif defined (HAVE_LIMITS_H)
-# include <limits.h>
 #else
-#error "check config.h file or compilation options: either HAVE_LIMITS or HAVE_LIMITS_H should be defined"
-#endif
-#endif
-
-
-#ifdef WNT
-# include <limits>
+# include <limits.h>
 #endif
 
 #if defined (__hpux) || defined (HPUX)

diff --git a/src/StepFile/recfile.pc b/src/StepFile/recfile.pc
index 9d0d557457b37a430bdf44f2f7fdc10e7de127f9..d0a32042aae8f67bd25f21fd8f8cd0777cf5d52d 100644 (file)
--- a/src/StepFile/recfile.pc
+++ b/src/StepFile/recfile.pc
@@ -16,7 +16,7 @@
 #include "stdio.h"
 #include "string.h"
 #include "stdlib.h"
-#if defined(HAVE_MALLOC_H)
+#if !defined(_WIN32)
 #include "malloc.h"
 #endif
 #include "recfile.ph" 

diff --git a/src/Storage/Storage_Schema.cxx b/src/Storage/Storage_Schema.cxx
index 2b4591a75f0154b701c052412ba319d499bb5698..f618f2cc5f50fcdb29ed9b2f8187d351617b0f90 100644 (file)
--- a/src/Storage/Storage_Schema.cxx
+++ b/src/Storage/Storage_Schema.cxx
@@ -37,18 +37,6 @@
 #include <Storage_StreamExtCharParityError.hxx>
 #include <Standard_ErrorHandler.hxx>
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined(HAVE_TIME_H) || defined(WNT)
-# include <time.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
 #include <locale.h>
 #include <stdio.h>
 

diff --git a/src/TCollection/TCollection_BasicMap.cxx b/src/TCollection/TCollection_BasicMap.cxx
index a3fc4a867ec88e4eaed45b2e6246eaa0453f19e6..99be8f6e6725fde3032c3b9aad762a035c130578 100644 (file)
--- a/src/TCollection/TCollection_BasicMap.cxx
+++ b/src/TCollection/TCollection_BasicMap.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TCollection_BasicMap.ixx>
 #include <TCollection.hxx>
 #include <TCollection_BasicMapIterator.hxx>

diff --git a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx
index 5d0686768d9ef48b20060a76ebfbd149c1088053..428cdcd61eb5a7a19f022950a4ff682a879147f7 100644 (file)
--- a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx
+++ b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TestTopOpe.ixx>
 
 #include <TestTopOpe_BOOP.hxx>
@@ -26,9 +23,6 @@
 #include <TColStd_HArray1OfBoolean.hxx>
 #include <Draw.hxx>
 #include <DBRep.hxx>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 extern void suppressarg(Standard_Integer& na,const char** a,const Standard_Integer d);
 #ifdef DEB

diff --git a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
index 3b779dbb19bf0870df562a7219703761a9effbe7..f2bdd7f2baa40cfc646502e240786f6c02d27059 100644 (file)
--- a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
+++ b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TestTopOpe.hxx>
 #include <TestTopOpe_HDSDisplayer.hxx>
 #include <TestTopOpeDraw_DrawableSHA.hxx>
@@ -55,10 +52,6 @@
 #include <Draw_Interpretor.hxx>
 #include <DrawTrSurf.hxx>
 
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
 class TSEEpar {
 public:
   TSEEpar(const TCollection_AsciiString& s) { set(s); }

diff --git a/src/TestTopOpe/TestTopOpe_OtherCommands.cxx b/src/TestTopOpe/TestTopOpe_OtherCommands.cxx
index e2b225311d7bf7e4e469dbba52d4d2a102b731a0..2352b914ffed9abc8085a710cccaddab5be8c551 100644 (file)
--- a/src/TestTopOpe/TestTopOpe_OtherCommands.cxx
+++ b/src/TestTopOpe/TestTopOpe_OtherCommands.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TestTopOpe.ixx>
 
 #include <DBRep.hxx>
@@ -40,12 +37,9 @@
 #include <BRep_Tool.hxx>
 #include <Precision.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 //=======================================================================
 // bounds S xmin ymin zmin zmax ymax zmax

diff --git a/src/TestTopOpe/TestTopOpe_VarsTopo.cxx b/src/TestTopOpe/TestTopOpe_VarsTopo.cxx
index 24ceb4bd6f2e7068e2bce2e15a404e3d5d65ea3f..dd1f267c78e751dca007468a602ab0e679a04963 100644 (file)
--- a/src/TestTopOpe/TestTopOpe_VarsTopo.cxx
+++ b/src/TestTopOpe/TestTopOpe_VarsTopo.cxx
@@ -14,14 +14,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TestTopOpe_VarsTopo.hxx>
 #include <TopOpeBRepTool.hxx>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 VarsTopo::VarsTopo() : mytolarc(0.), mytoltan(0.)
 {

diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx
index 5148d7e4fe368b8650173f29b7db310935f42140..8ec55a45f932db0136b6b36de6026c0cc7b73ee4 100644 (file)
--- a/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TestTopOpeDraw.hxx>
 #include <TestTopOpeDraw_Displayer.hxx>
 #include <TestTopOpeDraw_TTOT.hxx>
@@ -27,9 +24,6 @@
 #include <Draw_Appli.hxx>
 #include <TopOpeBRepTool_define.hxx>
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 //-----------------------------------------------------------------------
 // 0 = testtopopedraw_cdinp

diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.cxx
index 4b03187e98c2b2361938ce47bb1a12b9c2a25e48..dd4ab1168a754e9813f927a9c546c00f9f2c963d 100644 (file)
--- a/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.cxx
@@ -14,16 +14,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TestTopOpeDraw_TTOT.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <BRep_Tool.hxx>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 //=======================================================================
 //function : ShapeEnumToString

diff --git a/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx b/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx
index c670f8ed9cbbc117c0e697a847a7bd7ef46a97db..f3f32fe85495ead4425b249ca4366b5bba4998d7 100644 (file)
--- a/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx
+++ b/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx
@@ -14,19 +14,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TestTopOpeTools.hxx>
 #include <TestTopOpeTools_Trace.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
 #include <TopOpeBRepTool_define.hxx>
 
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
 #ifdef DEB
 TestTopOpeTools_Trace theTrace(100,"trace");
 TestTopOpeTools_Trace theContext(100,"context");

diff --git a/src/TopOpeBRep/TopOpeBRep_traceALWL.cxx b/src/TopOpeBRep/TopOpeBRep_traceALWL.cxx
index fe910c7462acaba099d185c42cdd77978bc19390..108c5268fcebd671a09a56019cc32cca4f979e43 100644 (file)
--- a/src/TopOpeBRep/TopOpeBRep_traceALWL.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_traceALWL.cxx
@@ -14,11 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
+#ifndef _WIN32
 # include <strings.h>
 #endif
 

diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Griddump.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Griddump.cxx
index b372e3810287d02ee6e8b224284954d445376c3a..f110ab565bdaffe0e9e6d326ab40b7538bfb8245 100644 (file)
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Griddump.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Griddump.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <TopOpeBRepBuild_Builder.ixx>
 #include <TopOpeBRepBuild_define.hxx>
 #include <stdio.h>
@@ -63,9 +60,6 @@
 #include <TopOpeBRepBuild_WireEdgeSet.hxx>
 
 #ifdef DEB
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer);
 extern Standard_Boolean TopOpeBRepDS_GettraceSPSXX(const Standard_Integer,const Standard_Integer);
 static TCollection_AsciiString PRODINS("dins ");

diff --git a/src/Units/Units_UnitsDictionary.cxx b/src/Units/Units_UnitsDictionary.cxx
index 8e619b240ee3996b8445729818108e3ca8b6705d..ca2bd4f7782b4050555482e41ede9e80aeebc16a 100644 (file)
--- a/src/Units/Units_UnitsDictionary.cxx
+++ b/src/Units/Units_UnitsDictionary.cxx
@@ -19,19 +19,8 @@
 
 #include <Standard_Stream.hxx>
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <stdio.h>
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if defined (HAVE_SYS_STAT_H) || defined(WNT)
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 
 #include <Units_Token.hxx>
 #include <Units_TokensSequence.hxx>

diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx
index 326c6814fbc286163246aafb1728250ae8d18e6d..1edd03e7ecb5e0819c2ba90a2c36f522420e9e86 100644 (file)
--- a/src/ViewerTest/ViewerTest.cxx
+++ b/src/ViewerTest/ViewerTest.cxx
@@ -58,13 +58,7 @@
 #include <Prs3d_IsoAspect.hxx>
 #include <TopTools_MapOfShape.hxx>
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
 #include <Draw_Interpretor.hxx>
 #include <TCollection_AsciiString.hxx>

diff --git a/src/ViewerTest/ViewerTest_FilletCommands.cxx b/src/ViewerTest/ViewerTest_FilletCommands.cxx
index 6fce7e96d3e59eeba18b7a37688130de7023100a..f8c84cb44d6faa0c5ad16d4bc64949bcdbceb8d4 100644 (file)
--- a/src/ViewerTest/ViewerTest_FilletCommands.cxx
+++ b/src/ViewerTest/ViewerTest_FilletCommands.cxx
@@ -14,12 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <ViewerTest.hxx>
-#include <string.h>
 #include <BRepTest.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <DBRep.hxx>
@@ -55,12 +50,9 @@
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_Shape.hxx>
 
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef WNT
+#ifdef _WIN32
 //#define strcasecmp strcmp Already defined in Standard
-#include <stdio.h>
+# include <stdio.h>
 #endif
 
 extern  Handle(AIS_Shape) GetAISShapeFromName(const char* name);

diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
index 39be280e7ac42bdaf6067eed6c34eabafef4433a..a05402dde64b3ab645984b938b6b7e7bf9d5732f 100644 (file)
--- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -14,14 +14,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <ViewerTest.hxx>
 
-#include <string.h>
-
 #include <Quantity_NameOfColor.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw.hxx>
@@ -139,13 +133,9 @@
 #include <Image_AlienPixMap.hxx>
 #include <TColStd_HArray1OfAsciiString.hxx>
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#ifdef WNT
-#define _CRT_SECURE_NO_DEPRECATE
-#pragma warning (disable:4996)
+#ifdef _WIN32
+# define _CRT_SECURE_NO_DEPRECATE
+# pragma warning (disable:4996)
 #endif
 
 extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();

diff --git a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx
index 6b6436bbd0aa388b9f5160d453b1c6c5839d9524..add97289d716e878579dba06d4796c9623d2cf40 100644 (file)
--- a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx
+++ b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx
@@ -13,10 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <ViewerTest.hxx>
 
 #include <AIS_Drawer.hxx>

diff --git a/src/ViewerTest/ViewerTest_RelationCommands.cxx b/src/ViewerTest/ViewerTest_RelationCommands.cxx
index 5c11870f088885d578908a563ab2768bac8e8580..9531a0a35cf3384026393282cf79c8d64fcd6cb6 100644 (file)
--- a/src/ViewerTest/ViewerTest_RelationCommands.cxx
+++ b/src/ViewerTest/ViewerTest_RelationCommands.cxx
@@ -15,9 +15,6 @@
 // commercial license or contractual agreement.
 
 #include <ViewerTest.hxx>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #include <AIS_AngleDimension.hxx>
 #include <AIS_Circle.hxx>
@@ -57,7 +54,6 @@
 #include <Precision.hxx>
 #include <Select3D_Projector.hxx>
 #include <StdSelect.hxx>
-#include <string.h>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <TColStd_MapOfInteger.hxx>
@@ -82,10 +78,6 @@ extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
 extern int ViewerMainLoop(Standard_Integer argc, const char** argv);
 extern Handle(AIS_InteractiveContext)& TheAISContext ();
 
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
 #define VertexMask 0x01
 #define EdgeMask 0x02
 #define FaceMask 0x04

diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index 5d5e01658236c494ffdd470dee6b5995afdfcab3..000e20e2f4ff56139cf833bb0e97e3f7dc1df760 100644 (file)
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #include <OpenGl_GlCore20.hxx>
 #include <AIS_Shape.hxx>
 #include <AIS_Drawer.hxx>