YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-18 02:50:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix 2 instances of void* pointer arithmetic

Browse Source 
Partially reverts 341e440c07

Let's see if this fixes the windows build on travis
This commit is contained in:
Gleb Mazovetskiy 2020-12-28 01:20:36 +00:00 committed by Alibek Omarov
parent 7b127c23f5
commit 36b32cad0f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ref_gl/gl_dbghulls.c
View File

@ -17,7 +17,7 @@ GNU General Public License for more details.
#include "mod_local.h" #include "mod_local.h"
#define list_entry( ptr, type, member ) \ #define list_entry( ptr, type, member ) \
((type *)((void *)(ptr) - (size_t)(&((type *)0)->member))) ((type *)((char *)(ptr) - (size_t)(&((type *)0)->member)))
// iterate over each entry in the list // iterate over each entry in the list
#define list_for_each_entry( pos, head, member ) \ #define list_for_each_entry( pos, head, member ) \

2
ref_gl/gl_sprite.c
View File

@ -87,7 +87,7 @@ static const dframetype_t *R_SpriteLoadFrame( model_t *mod, const void *pin, msp
pspriteframe->gl_texturenum = gl_texturenum; pspriteframe->gl_texturenum = gl_texturenum;
*ppframe = pspriteframe; *ppframe = pspriteframe;
return ( const dframetype_t* )(( const void* )pin + sizeof( dspriteframe_t ) + pinframe.width * pinframe.height * bytes ); return ( const dframetype_t* )(( const byte* )pin + sizeof( dspriteframe_t ) + pinframe.width * pinframe.height * bytes );
} }
/* /*