[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

[Denis Barbier]

The following commit has been merged in the upstream branch:
commit bbb77dfcd85c5ae0163477769bbbc7681a4e0eca
Author: Denis Barbier <bouzim at gmail.com>
Date:   Fri Aug 5 09:02:08 2011 +0200

    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.

diff --git a/inc/Standard_Time.hxx b/inc/Standard_Time.hxx
index fc5e5e7..76f074b 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 7eece1f..360702c 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 bd67a51..cf6b0a4 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 93dfe62..86f1961 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

-- 
OCE packaging