OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

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

Browse Source 
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
This commit is contained in:
apn 2014-09-05 10:39:31 +04:00 committed by bugmaster
parent 71b73fde24
commit 03155c18a5
74 changed files with 74 additions and 877 deletions
CMakeLists.txt
samples/qt
IESample
IESample.pro
Tutorial
Tutorial.pro
VoxelDemo
VoxelDemo.pro
src
BRepTest
BRepTest_ChamferCommands.cxxBRepTest_CheckCommands.cxxBRepTest_FeatureCommands.cxxBRepTest_FilletCommands.cxxBRepTest_SurfaceCommands.cxxBRepTest_TopologyCommands.cxx
DBRep
DBRep.cxx
Draw
Draw.cxxDraw_BasicCommands.cxxDraw_GraphicCommands.cxxDraw_Interpretor.cxxDraw_Main.cxxDraw_VariableCommands.cxxDraw_Window.cxx
DrawTrSurf
DrawTrSurf.cxxDrawTrSurf_Point.cxx
GeomliteTest
GeomliteTest_SurfaceCommands.cxx
Graphic3d
Graphic3d_Structure.pxx
Image
Image_AlienPixMap.cxx
OSD
OSD.cxxOSD_Chronometer.cxxOSD_Directory.cxxOSD_DirectoryIterator.cxxOSD_Disk.cxxOSD_File.cxxOSD_FileIterator.cxxOSD_FileNode.cxxOSD_Host.cxxOSD_Path.cxxOSD_Process.cxxOSD_SharedLibrary.cxxOSD_Timer.cxxOSD_signal.cxx
OpenGl
OpenGl_GraduatedTrihedron.cxxOpenGl_GraphicDriver.cxxOpenGl_GraphicDriver_Export.cxxOpenGl_LineAttributes.cxxOpenGl_Text.cxxOpenGl_Workspace.cxxOpenGl_Workspace_2.cxxOpenGl_Workspace_5.cxx
PCollection
PCollection_HAsciiString.cxxPCollection_HExtendedString.cxx
QABugs
QABugs_3.cxx
STEPConstruct
STEPConstruct_AP203Context.cxx
Standard
Standard_CLocaleSentry.cxxStandard_ExtString.cxxStandard_MMgrOpt.cxxStandard_Macro.hxxStandard_Type.cxxStandard_values.h
StepFile
recfile.pc
Storage
Storage_Schema.cxx
TCollection
TCollection_BasicMap.cxx
TestTopOpe
TestTopOpe_BOOPCommands.cxxTestTopOpe_HDSCommands.cxxTestTopOpe_OtherCommands.cxxTestTopOpe_VarsTopo.cxx
TestTopOpeDraw
TestTopOpeDraw_OtherCommands.cxxTestTopOpeDraw_TTOT.cxx
TestTopOpeTools
TestTopOpeTools_TraceCommands.cxx
TopOpeBRep
TopOpeBRep_traceALWL.cxx
TopOpeBRepBuild
TopOpeBRepBuild_Griddump.cxx
Units
Units_UnitsDictionary.cxx
ViewerTest
ViewerTest.cxxViewerTest_FilletCommands.cxxViewerTest_ObjectCommands.cxxViewerTest_OpenGlCommands.cxxViewerTest_RelationCommands.cxxViewerTest_ViewerCommands.cxx

4
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

2
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

2
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

2
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

9
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

7
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)

9
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;

12
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;

8
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--

7
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
//=======================================================================

10
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]))

25
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>

21
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

9
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;

6
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)

12
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

8
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>

36
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

30
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);

14
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);

8
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

14
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

4
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>

20
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)
{

25
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>

27
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;

18
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;

50
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;

19
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';

21
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

31
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;

50
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);
}

8
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;

29
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(){
}

56
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

8
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

52
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)
//============================================================================

5
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

4
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>

4
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

4
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

4
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

4
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>

4
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>

4
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>

12
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

12
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

3
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>

17
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>

4
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>

4
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>

28
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
#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)

4
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_()

4
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>

17
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)

2
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"

12
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>

3
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>

6
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

7
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); }

8
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

6
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.)
{

6
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

6
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

7
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");

6
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

6
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 ");

13
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>

6
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>

12
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);

16
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();

4
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>

8
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

4
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>