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

Port offsetof "fix" from sdk2013.

Browse Source
This commit is contained in:
Nicholas Hastings
2014-11-09 10:22:50 -05:00
parent 41e9af392f
commit c1c3f9d00e
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/datamap.h
View File

@ -120,10 +120,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 SIZE_OF_ARRAY(p) _ARRAYSIZE(p) #define SIZE_OF_ARRAY(p) _ARRAYSIZE(p)

4
public/studio.h
View File

@ -28,10 +28,6 @@
#include "localflexcontroller.h" #include "localflexcontroller.h"
#ifndef offsetof
#define offsetof(s,m) (size_t)&(((s *)0)->m)
#endif
#define STUDIO_ENABLE_PERF_COUNTERS #define STUDIO_ENABLE_PERF_COUNTERS
#define STUDIO_SEQUENCE_ACTIVITY_LOOKUPS_ARE_SLOW 0 #define STUDIO_SEQUENCE_ACTIVITY_LOOKUPS_ARE_SLOW 0

11
public/tier0/platform.h
View File

@ -252,6 +252,17 @@ 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
#define ALIGN_VALUE( val, alignment ) ( ( val + alignment - 1 ) & ~( alignment - 1 ) ) // need macro for constant expression #define ALIGN_VALUE( val, alignment ) ( ( val + alignment - 1 ) & ~( alignment - 1 ) ) // need macro for constant expression
// Used to step into the debugger // Used to step into the debugger

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