Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +08:00
Code Activity

Port offsetof "fix" from sdk2013.

Browse Source
This commit is contained in:
Nicholas Hastings
2014-11-09 10:31:44 -05:00
parent f89ee26696
commit e7165f8f0d
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/datamap.h
View File

@ -110,10 +110,6 @@ DECLARE_FIELD_SIZE( FIELD_MODELINDEX, sizeof(int) )
DECLARE_FIELD_SIZE( FIELD_MATERIALINDEX, sizeof(int) ) DECLARE_FIELD_SIZE( FIELD_MATERIALINDEX, sizeof(int) )
#ifndef offsetof
#define offsetof(s,m) (size_t)&(((s *)0)->m)
#endif
#define ARRAYSIZE2D(p) (sizeof(p)/sizeof(p[0][0])) #define ARRAYSIZE2D(p) (sizeof(p)/sizeof(p[0][0]))
#define _FIELD(name,fieldtype,count,flags,mapname,tolerance) { fieldtype, #name, { offsetof(classNameTypedef, name), 0 }, count, flags, mapname, NULL, NULL, NULL, sizeof( ((classNameTypedef *)0)->name ), NULL, 0, tolerance } #define _FIELD(name,fieldtype,count,flags,mapname,tolerance) { fieldtype, #name, { offsetof(classNameTypedef, name), 0 }, count, flags, mapname, NULL, NULL, NULL, sizeof( ((classNameTypedef *)0)->name ), NULL, 0, tolerance }

3
public/studio.h
View File

@ -23,9 +23,6 @@
#include "utlvector.h" #include "utlvector.h"
#ifndef offsetof
#define offsetof(s,m) (size_t)&(((s *)0)->m)
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

10
public/tier0/platform.h
View File

@ -223,6 +223,16 @@ typedef void * HINSTANCE;
#define MAX_PATH 260 #define MAX_PATH 260
#endif #endif
#ifdef GNUC
#undef offsetof
//#define offsetof( type, var ) __builtin_offsetof( type, var )
#define offsetof(s,m) (size_t)&(((s *)0)->m)
#else
#undef offsetof
#define offsetof(s,m) (size_t)&(((s *)0)->m)
#endif
// Used to step into the debugger // Used to step into the debugger
#ifdef _WIN32 #ifdef _WIN32
#define DebuggerBreak() __asm { int 3 } #define DebuggerBreak() __asm { int 3 }

4
public/vgui_controls/MessageMap.h
View File

@ -22,10 +22,6 @@ namespace vgui
////////////// MESSAGEMAP DEFINITIONS ////////////// ////////////// MESSAGEMAP DEFINITIONS //////////////
#ifndef offsetof
#define offsetof(s,m) (size_t)&(((s *)0)->m)
#endif
#ifndef ARRAYSIZE #ifndef ARRAYSIZE
#define ARRAYSIZE(p) (sizeof(p)/sizeof(p[0])) #define ARRAYSIZE(p) (sizeof(p)/sizeof(p[0]))
#endif #endif