TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove non-GNU PIGGY_PAGE_IN

Browse source 
Non-GNU PIGGY_PAGE_IN uses a do {} while(0), but some callers are in a
context where do{}while() is an error.
This commit is contained in:
Kp 2015-08-22 20:43:03 +00:00
parent 423c1c3f10
commit b946011299
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/main/piggy.h
View file

@ -113,8 +113,6 @@ extern int piggy_page_flushed;
extern array<digi_sound, MAX_SOUND_FILES> GameSounds;
extern array<grs_bitmap, MAX_BITMAP_FILES> GameBitmaps;
/* Make GNUC use static inline function as #define with backslash continuations causes problems with dos linefeeds */
# ifdef __GNUC__
# define PIGGY_PAGE_IN(bmp) _piggy_page_in(bmp)
static inline void _piggy_page_in(bitmap_index bmp) {
if ( GameBitmaps[(bmp).index].bm_flags & BM_FLAG_PAGED_OUT ) {
@ -122,16 +120,6 @@ static inline void _piggy_page_in(bitmap_index bmp) {
}
}
# else /* __GNUC__ */
#define PIGGY_PAGE_IN(bmp) \
do { \
if ( GameBitmaps[(bmp).index].bm_flags & BM_FLAG_PAGED_OUT ) {\
piggy_bitmap_page_in( bmp ); \
} \
} while(0)
# endif /* __GNUC__ */
#if defined(DXX_BUILD_DESCENT_I)
void piggy_read_sounds(int pc_shareware);
#elif defined(DXX_BUILD_DESCENT_II)