Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-01-04 00:23:25 +08:00
Code

Merge.

Browse Source
This commit is contained in:
Nicholas Hastings 2012-06-27 22:17:52 -04:00
commit 44d15276cf
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/tier0/dbg.h
View File

@ -178,6 +178,12 @@ enum SpewRetval_t
/* type of externally defined function used to display debug spew */
typedef SpewRetval_t (*SpewOutputFunc_t)( SpewType_t spewType, const tchar *pMsg );
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
#endif
/* Used to redirect spew output */
DBG_INTERFACE void SpewOutputFunc( SpewOutputFunc_t func );
@ -206,6 +212,10 @@ DBG_INTERFACE bool SetupWin32ConsoleIO();
// Returns true if they want to break in the debugger.
DBG_INTERFACE bool DoNewAssertDialog( const tchar *pFile, int line, const tchar *pExpression );
#ifdef __clang__
#pragma clang diagnostic pop
#endif
/* Used to define macros, never use these directly. */
#define _AssertMsg( _exp, _msg, _executeExp, _bFatal ) \

10
public/tier0/platform.h
View File

@ -824,8 +824,18 @@ struct CPUInformation
tchar* m_szProcessorID; // Processor vendor Identification.
};
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
#endif
PLATFORM_INTERFACE const CPUInformation& GetCPUInformation();
#ifdef __clang__
#pragma clang diagnostic pop
#endif
PLATFORM_INTERFACE void GetCurrentDate( int *pDay, int *pMonth, int *pYear );
// ---------------------------------------------------------------------------------- //