From: <se...@us...> - 2013-01-31 15:02:15
|
Revision: 5578 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5578&view=rev Author: sezero Date: 2013-01-31 15:02:06 +0000 (Thu, 31 Jan 2013) Log Message: ----------- Merge from trunk r5525: * winbase.h: Use wrapper instead of macro for GetCurrentTime in C++ Revision Links: -------------- http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5525&view=rev Modified Paths: -------------- stable/v2.x/mingw-w64-crt/revstamp.h stable/v2.x/mingw-w64-headers/include/ChangeLog stable/v2.x/mingw-w64-headers/include/winbase.h Modified: stable/v2.x/mingw-w64-crt/revstamp.h =================================================================== --- stable/v2.x/mingw-w64-crt/revstamp.h 2013-01-31 15:01:39 UTC (rev 5577) +++ stable/v2.x/mingw-w64-crt/revstamp.h 2013-01-31 15:02:06 UTC (rev 5578) @@ -1,4 +1,4 @@ /* Do not edit. Autogenerated. */ -#define __MINGW_W64_REV "5576" +#define __MINGW_W64_REV "5578" #define __MINGW_W64_REV_STAMP "2013-01-31" Modified: stable/v2.x/mingw-w64-headers/include/ChangeLog =================================================================== --- stable/v2.x/mingw-w64-headers/include/ChangeLog 2013-01-31 15:01:39 UTC (rev 5577) +++ stable/v2.x/mingw-w64-headers/include/ChangeLog 2013-01-31 15:02:06 UTC (rev 5578) @@ -1,3 +1,8 @@ +2013-01-31 Jacek Caban <ja...@co...> + + Merge from trunk r5525: + * winbase.h: Use wrapper instead of macro for GetCurrentTime in C++ + 2013-01-31 Kai Tietz <kt...@re...> Merge from trunk r5573-r5574: Modified: stable/v2.x/mingw-w64-headers/include/winbase.h =================================================================== --- stable/v2.x/mingw-w64-headers/include/winbase.h 2013-01-31 15:01:39 UTC (rev 5577) +++ stable/v2.x/mingw-w64-headers/include/winbase.h 2013-01-31 15:02:06 UTC (rev 5578) @@ -22,7 +22,6 @@ #define SetSwapAreaSize(w) (w) #define LockSegment(w) GlobalFix((HANDLE)(w)) #define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) -#define GetCurrentTime() GetTickCount() #define Yield() @@ -1524,12 +1523,20 @@ WINBASEAPI LONG WINAPI CompareFileTime(CONST FILETIME *lpFileTime1,CONST FILETIME *lpFileTime2); WINBASEAPI WINBOOL WINAPI FileTimeToDosDateTime(CONST FILETIME *lpFileTime,LPWORD lpFatDate,LPWORD lpFatTime); WINBASEAPI WINBOOL WINAPI DosDateTimeToFileTime(WORD wFatDate,WORD wFatTime,LPFILETIME lpFileTime); - WINBASEAPI DWORD WINAPI GetTickCount(VOID); WINBASEAPI WINBOOL WINAPI SetSystemTimeAdjustment(DWORD dwTimeAdjustment,WINBOOL bTimeAdjustmentDisabled); WINBASEAPI WINBOOL WINAPI GetSystemTimeAdjustment(PDWORD lpTimeAdjustment,PDWORD lpTimeIncrement,PBOOL lpTimeAdjustmentDisabled); WINBASEAPI DWORD WINAPI FormatMessageA(DWORD dwFlags,LPCVOID lpSource,DWORD dwMessageId,DWORD dwLanguageId,LPSTR lpBuffer,DWORD nSize,va_list *Arguments); WINBASEAPI DWORD WINAPI FormatMessageW(DWORD dwFlags,LPCVOID lpSource,DWORD dwMessageId,DWORD dwLanguageId,LPWSTR lpBuffer,DWORD nSize,va_list *Arguments); + WINBASEAPI DWORD WINAPI GetTickCount(VOID); +#ifndef __cplusplus +#define GetCurrentTime() GetTickCount() +#else + DWORD FORCEINLINE GetCurrentTime(void) { + return GetTickCount(); + } +#endif + #define FORMAT_MESSAGE_ALLOCATE_BUFFER 0x100 #define FORMAT_MESSAGE_IGNORE_INSERTS 0x200 #define FORMAT_MESSAGE_FROM_STRING 0x400 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |