diff options
| author | Denis Barbier <bouzim@gmail.com> | 2011-08-05 09:02:08 +0200 |
|---|---|---|
| committer | Denis Barbier <bouzim@gmail.com> | 2012-01-16 20:58:21 +0100 |
| commit | bbb77dfcd85c5ae0163477769bbbc7681a4e0eca (patch) | |
| tree | 014b655a2a5605efb045efe4727642f81e17f3ff | |
| parent | 218ea3ddfc78d599edb0e1e975cacb119ea406bd (diff) | |
| download | oce-bbb77dfcd85c5ae0163477769bbbc7681a4e0eca.tar.gz oce-bbb77dfcd85c5ae0163477769bbbc7681a4e0eca.zip | |
On Windows, use stat instead of _stat to use time_t type on 32 and 64 bits
In Standard_Time.hxx, define Standard_Time via a typedef instead of a #define,
like other Standard_* definitions in Standard_Typedef.hxx.
| -rw-r--r-- | inc/Standard_Time.hxx | 9 | ||||
| -rw-r--r-- | src/Dynamic/Dynamic_FuzzyDefinitionsDictionary.cxx | 5 | ||||
| -rw-r--r-- | src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx | 4 | ||||
| -rw-r--r-- | src/Materials/Materials_MaterialsDictionary.cxx | 3 |
4 files changed, 5 insertions, 16 deletions
diff --git a/inc/Standard_Time.hxx b/inc/Standard_Time.hxx index fc5e5e78..76f074b1 100644 --- a/inc/Standard_Time.hxx +++ b/inc/Standard_Time.hxx @@ -1,3 +1,6 @@ +#ifndef _Standard_Time_HeaderFile +#define _Standard_Time_HeaderFile + // File : Standard_Time.hxx // Created : Fri Jan 13 2012 for OpenCascade Community edition // Author : Fotis Sioutis <sfotis at gmail dot com> @@ -7,8 +10,6 @@ /* time.h is well standardised across various platforms */ #include <time.h> -#if defined( _MSC_VER ) && defined ( _TIME64_T_DEFINED ) -#define Standard_Time __time64_t -#else -#define Standard_Time time_t +typedef time_t Standard_Time; + #endif diff --git a/src/Dynamic/Dynamic_FuzzyDefinitionsDictionary.cxx b/src/Dynamic/Dynamic_FuzzyDefinitionsDictionary.cxx index 7eece1ff..360702cd 100644 --- a/src/Dynamic/Dynamic_FuzzyDefinitionsDictionary.cxx +++ b/src/Dynamic/Dynamic_FuzzyDefinitionsDictionary.cxx @@ -35,11 +35,6 @@ # include <strings.h> #endif -#ifdef WNT -//#define strcasecmp _stricoll -#define stat _stat -#endif - //======================================================================= //function : Dynamic_FuzzyDefinitionsDictionary //purpose : diff --git a/src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx b/src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx index bd67a514..cf6b0a4c 100644 --- a/src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx +++ b/src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx @@ -35,10 +35,6 @@ #ifdef HAVE_STRINGS_H # include <strings.h> #endif -#ifdef WNT -#define stat _stat -//#define strcasecmp _stricoll -#endif //======================================================================= //function : Dynamic_MethodDefinitionsDictionary diff --git a/src/Materials/Materials_MaterialsDictionary.cxx b/src/Materials/Materials_MaterialsDictionary.cxx index 93dfe62b..86f19619 100644 --- a/src/Materials/Materials_MaterialsDictionary.cxx +++ b/src/Materials/Materials_MaterialsDictionary.cxx @@ -32,9 +32,6 @@ #include <Quantity_Color.hxx> #include <TCollection_AsciiString.hxx> -#ifdef WNT -#define stat _stat -#endif //#define strcasecmp _stricoll #include <stdio.h> //#endif |