1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00

0022972: Eliminate macro definitions that has compiler-provided analogs (WNT and so on)

1) Macro definition WNT replaced by _WIN32 and _MSC_VER for platform and compiler detection accordingly.
2) Macro definition LIN replaced by __linux__ macro.
3) Macro definition DEB replaced by OCCT_DEBUG macro.
This commit is contained in:
akz
2015-09-15 17:46:43 +03:00
committed by kgv
parent 28a73c1fe7
commit 57c28b6122
180 changed files with 370 additions and 411 deletions

View File

@@ -20,7 +20,7 @@
#include <ExprIntrp_Analysis.hxx>
#ifndef _ExprIntrp_API
# if !defined(WNT) || defined(__ExprIntrp_DLL) || defined(__Expr_DLL) || defined(__ExprIntrp_DLL) || defined(__math_DLL) || defined(__MathBase_DLL) || defined(__ElCLib_DLL) || defined(__ElSLib_DLL) || defined(__BSplCLib_DLL) || defined(__BSplSLib_DLL) || defined(__Smoothing_DLL) || defined(__SysBase_DLL) || defined(__Data_DLL) || defined(__PLib_DLL) || defined(__GeomAbs_DLL) || defined(__Poly_DLL) || defined(__CSLib_DLL) || defined(__Convert_DLL) || defined(__Bnd_DLL) || defined(__gp_DLL) || defined(__TColgp_DLL)
# if !defined(_WIN32) || defined(__ExprIntrp_DLL) || defined(__Expr_DLL) || defined(__ExprIntrp_DLL) || defined(__math_DLL) || defined(__MathBase_DLL) || defined(__ElCLib_DLL) || defined(__ElSLib_DLL) || defined(__BSplCLib_DLL) || defined(__BSplSLib_DLL) || defined(__Smoothing_DLL) || defined(__SysBase_DLL) || defined(__Data_DLL) || defined(__PLib_DLL) || defined(__GeomAbs_DLL) || defined(__Poly_DLL) || defined(__CSLib_DLL) || defined(__Convert_DLL) || defined(__Bnd_DLL) || defined(__gp_DLL) || defined(__TColgp_DLL)
# define __ExprIntrp_API Standard_EXPORT
# define __ExprIntrp_APIEXTERN Standard_EXPORTEXTERN
# else

View File

@@ -20,11 +20,11 @@
static TCollection_AsciiString ExprIntrp_curres;
static int ExprIntrp_degree;
#ifndef WNT
#ifndef _WIN32
extern char* ExprIntrptext;
#else
extern "C" char* ExprIntrptext;
#endif // WNT
#endif // _WIN32
extern "C" void ExprIntrp_SetResult()

View File

@@ -28,10 +28,10 @@
#include <stdio.h>
#ifdef WNT
#ifdef _MSC_VER
# include <stdlib.h>
# include <io.h>
#endif /* WNT */
#endif /* _MSC_VER */