Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't redeclare struct tm if it's already declared in std headers; declare and define localtime() and company as extern C as they are supposed to be

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-06-16 00:09:18 +00:00
parent 4fb9d560c4
commit 92bdf9f72f
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/msw/wince/time.h
View File

@@ -7,6 +7,8 @@
#ifndef __WINCE_TIME_ #ifndef __WINCE_TIME_
#define __WINCE_TIME_ #define __WINCE_TIME_
#ifndef _TM_DEFINED
struct tm { struct tm {
int tm_sec; /* seconds after the minute - [0,59] */ int tm_sec; /* seconds after the minute - [0,59] */
int tm_min; /* minutes after the hour - [0,59] */ int tm_min; /* minutes after the hour - [0,59] */
@@ -19,6 +21,9 @@ struct tm {
int tm_isdst; /* daylight savings time flag */ int tm_isdst; /* daylight savings time flag */
}; };
extern "C"
{
struct tm * __cdecl localtime(const time_t *); struct tm * __cdecl localtime(const time_t *);
time_t __cdecl time(time_t *); time_t __cdecl time(time_t *);
@@ -29,10 +34,13 @@ struct tm * __cdecl gmtime(const time_t *);
#define _tcsftime wcsftime #define _tcsftime wcsftime
size_t __cdecl wcsftime(wchar_t *, size_t, const wchar_t *, size_t __cdecl wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm *);
const struct tm *);
}
extern long timezone; extern long timezone;
#endif #endif // !_TM_DEFINED
#endif // __WINCE_TIME_

8
src/msw/wince/time.cpp
View File

@@ -99,6 +99,9 @@ static struct tm * __cdecl common_localtime(const time_t * WXUNUSED(t), BOOL bLo
return res; return res;
} }
extern "C"
{
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Receive the number of seconds elapsed since midnight(00:00:00) // Receive the number of seconds elapsed since midnight(00:00:00)
// and convert a time value and corrects for the local time zone // and convert a time value and corrects for the local time zone
@@ -117,6 +120,7 @@ struct tm * __cdecl gmtime(const time_t *t)
return common_localtime(t, DO_GMTIME) ; return common_localtime(t, DO_GMTIME) ;
} }
}
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Common code for conversion of struct tm into time_t (static) // Common code for conversion of struct tm into time_t (static)
@@ -145,6 +149,8 @@ static time_t __cdecl common_tm_to_time(int day, int month, int year, int hour,
return prog ; return prog ;
} }
extern "C"
{
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Returns the number of seconds elapsed since // Returns the number of seconds elapsed since
@@ -183,3 +189,5 @@ size_t __cdecl wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm *)
return 0; return 0;
} }
} // extern "C"