1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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