diff --git a/src/byteptr.h b/src/byteptr.h
index 410d7c00442f77767a436a9f252b8082f67aa818..364e6520cf20c186f18cd47fd4e820204de0b16f 100644
--- a/src/byteptr.h
+++ b/src/byteptr.h
@@ -15,7 +15,9 @@
#define DEALIGNED
#endif
-#ifndef _BIG_ENDIAN
+#include "endian.h"
+
+#ifndef SRB2_BIG_ENDIAN
//
// Little-endian machines
//
@@ -75,7 +77,7 @@
#define READANGLE(p) *((angle_t *)p)++
#endif
-#else //_BIG_ENDIAN
+#else //SRB2_BIG_ENDIAN
//
// definitions for big-endian machines with alignment constraints.
//
@@ -144,7 +146,7 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
#define READCHAR(p) ({ char *p_tmp = ( char *)p; char b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
#define READFIXED(p) ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b = readlong(p); p_tmp++; p = (void *)p_tmp; b; })
#define READANGLE(p) ({ angle_t *p_tmp = (angle_t *)p; angle_t b = readulong(p); p_tmp++; p = (void *)p_tmp; b; })
-#endif //_BIG_ENDIAN
+#endif //SRB2_BIG_ENDIAN
#undef DEALIGNED
diff --git a/src/d_main.c b/src/d_main.c
index 78e370cc3631d8bfaa53354ba2653a3e3443cf88..b03c0941ed741d8e25787073c33927498069ac9e 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -170,7 +170,7 @@ void D_PostEvent(const event_t *ev)
eventhead = (eventhead+1) & (MAXEVENTS-1);
}
// just for lock this function
-#ifndef DOXYGEN
+#if defined (PC_DOS) && !defined (DOXYGEN)
void D_PostEvent_end(void) {};
#endif
@@ -764,10 +764,6 @@ static inline void D_CleanFile(void)
}
}
-#ifndef _MAX_PATH
-#define _MAX_PATH MAX_WADPATH
-#endif
-
// ==========================================================================
// Identify the SRB2 version, and IWAD file to use.
// ==========================================================================
diff --git a/src/d_main.h b/src/d_main.h
index d73b19d1f6e5fd34ab5fd0470a5c762379c6fd8b..4c9c99ea5277adf90224fdf9d42a2e1b1754c73e 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -40,8 +40,8 @@ void D_SRB2Main(void);
// Called by IO functions when input is detected.
void D_PostEvent(const event_t *ev);
-#ifndef DOXYGEN
-FUNCMATH void D_PostEvent_end(void); // delimiter for locking memory
+#if defined (PC_DOS) && !defined (DOXYGEN)
+void D_PostEvent_end(void); // delimiter for locking memory
#endif
void D_ProcessEvents(void);
diff --git a/src/dehacked.c b/src/dehacked.c
index b7e874b1683da2110493595a61dddfd6342e63e6..2fed963f8f3f548aa395b277a0f6923a8261c590 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7769,7 +7769,7 @@ fixed_t get_number(const char *word)
#endif
}
-void FUNCMATH DEH_Check(void)
+void DEH_Check(void)
{
#if defined(_DEBUG) || defined(PARANOIA)
const size_t dehstates = sizeof(STATE_LIST)/sizeof(const char*);
diff --git a/src/doomtype.h b/src/doomtype.h
index a711b466d6ccf61d8262534cb585f0a7a3ef7c2e..67c279aa980cc03bb496a2ba9062bf4ed4cb1a46 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -44,12 +44,13 @@
typedef long ssize_t;
/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
-#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
-#define DWORD_PTR DWORD
-#endif
-
-#if ((_MSC_VER <= 1200) && (!defined(PDWORD_PTR)))
-#define PDWORD_PTR PDWORD
+#if (_MSC_VER <= 1200)
+ #ifndef DWORD_PTR
+ #define DWORD_PTR DWORD
+ #endif
+ #ifndef PDWORD_PTR
+ #define PDWORD_PTR PDWORD
+ #endif
#endif
#elif defined (_arch_dreamcast) // KOS Dreamcast
#include <arch/types.h>
@@ -97,12 +98,14 @@ typedef long ssize_t;
#define NOIPX
#endif
+/* Strings and some misc platform specific stuff */
+
#if defined (_MSC_VER) || defined (__OS2__)
// Microsoft VisualC++
#ifdef _MSC_VER
#if (_MSC_VER <= 1800) // MSVC 2013 and back
#define snprintf _snprintf
-#if (_MSC_VER <= 1200) // MSVC 2012 and back
+#if (_MSC_VER <= 1200) // MSVC 6.0 and back
#define vsnprintf _vsnprintf
#endif
#endif
@@ -178,6 +181,8 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
// not the number of bytes in the buffer.
#define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst)
+/* Boolean type definition */
+
// \note __BYTEBOOL__ used to be set above if "macintosh" was defined,
// if macintosh's version of boolean type isn't needed anymore, then isn't this macro pointless now?
#ifndef __BYTEBOOL__
@@ -185,7 +190,7 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
//faB: clean that up !!
#if defined( _MSC_VER) && (_MSC_VER >= 1800) // MSVC 2013 and forward
- #include "stdbool.h"
+ #include "stdbool.h"
#elif (defined (_WIN32) || (defined (_WIN32_WCE) && !defined (__GNUC__))) && !defined (_XBOX)
#define false FALSE // use windows types
#define true TRUE
@@ -240,93 +245,71 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */
#endif
-union FColorRGBA
-{
- UINT32 rgba;
- struct
- {
- UINT8 red;
- UINT8 green;
- UINT8 blue;
- UINT8 alpha;
- } s;
-} ATTRPACK;
-typedef union FColorRGBA RGBA_t;
+/* Compiler-specific attributes and other macros */
-typedef enum
-{
- postimg_none,
- postimg_water,
- postimg_motion,
- postimg_flip,
- postimg_heat
-} postimg_t;
+#ifdef __GNUC__ // __attribute__ ((X))
+ #define FUNCNORETURN __attribute__ ((noreturn))
+
+ #if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && defined (__MINGW32__) // MinGW, >= GCC 4.1
+ #include "inttypes.h"
+ #if 0 //defined (__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO > 0
+ #define FUNCPRINTF __attribute__ ((format(gnu_printf, 1, 2)))
+ #define FUNCDEBUG __attribute__ ((format(gnu_printf, 2, 3)))
+ #define FUNCIERROR __attribute__ ((format(gnu_printf, 1, 2),noreturn))
+ #elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) // >= GCC 4.4
+ #define FUNCPRINTF __attribute__ ((format(ms_printf, 1, 2)))
+ #define FUNCDEBUG __attribute__ ((format(ms_printf, 2, 3)))
+ #define FUNCIERROR __attribute__ ((format(ms_printf, 1, 2),noreturn))
+ #else
+ #define FUNCPRINTF __attribute__ ((format(printf, 1, 2)))
+ #define FUNCDEBUG __attribute__ ((format(printf, 2, 3)))
+ #define FUNCIERROR __attribute__ ((format(printf, 1, 2),noreturn))
+ #endif
+ #else
+ #define FUNCPRINTF __attribute__ ((format(printf, 1, 2)))
+ #define FUNCDEBUG __attribute__ ((format(printf, 2, 3)))
+ #define FUNCIERROR __attribute__ ((format(printf, 1, 2),noreturn))
+ #endif
-typedef UINT32 lumpnum_t; // 16 : 16 unsigned long (wad num: lump num)
-#define LUMPERROR UINT32_MAX
+ #ifndef FUNCIERROR
+ #define FUNCIERROR __attribute__ ((noreturn))
+ #endif
-typedef UINT32 tic_t;
-#define INFTICS UINT32_MAX
+ #define FUNCMATH __attribute__((const))
-#ifdef _BIG_ENDIAN
-#define UINT2RGBA(a) a
-#else
-#define UINT2RGBA(a) (UINT32)((a&0xff)<<24)|((a&0xff00)<<8)|((a&0xff0000)>>8)|(((UINT32)a&0xff000000)>>24)
-#endif
+ #if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) // >= GCC 3.1
+ #define FUNCDEAD __attribute__ ((deprecated))
+ #define FUNCINLINE __attribute__((always_inline))
+ #define FUNCNONNULL __attribute__((nonnull))
+ #endif
-#ifdef __GNUC__ // __attribute__ ((X))
-#define FUNCNORETURN __attribute__ ((noreturn))
-#if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && defined (__MINGW32__)
-#include "inttypes.h"
-#if 0 //defined (__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO > 0
-#define FUNCPRINTF __attribute__ ((format(gnu_printf, 1, 2)))
-#define FUNCDEBUG __attribute__ ((format(gnu_printf, 2, 3)))
-#define FUNCIERROR __attribute__ ((format(gnu_printf, 1, 2),noreturn))
-#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-#define FUNCPRINTF __attribute__ ((format(ms_printf, 1, 2)))
-#define FUNCDEBUG __attribute__ ((format(ms_printf, 2, 3)))
-#define FUNCIERROR __attribute__ ((format(ms_printf, 1, 2),noreturn))
-#else
-#define FUNCPRINTF __attribute__ ((format(printf, 1, 2)))
-#define FUNCDEBUG __attribute__ ((format(printf, 2, 3)))
-#define FUNCIERROR __attribute__ ((format(printf, 1, 2),noreturn))
-#endif
-#else
-#define FUNCPRINTF __attribute__ ((format(printf, 1, 2)))
-#define FUNCDEBUG __attribute__ ((format(printf, 2, 3)))
-#define FUNCIERROR __attribute__ ((format(printf, 1, 2),noreturn))
-#endif
-#ifndef FUNCIERROR
-#define FUNCIERROR __attribute__ ((noreturn))
-#endif
-#define FUNCMATH __attribute__((const))
-#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define FUNCDEAD __attribute__ ((deprecated))
-#define FUNCINLINE __attribute__((always_inline))
-#define FUNCNONNULL __attribute__((nonnull))
-#endif
-#define FUNCNOINLINE __attribute__((noinline))
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-#ifdef __i386__ // i386 only
-#define FUNCTARGET(X) __attribute__ ((__target__ (X)))
-#endif
-#endif
-#if defined (__MINGW32__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#define ATTRPACK __attribute__((packed, gcc_struct))
-#else
-#define ATTRPACK __attribute__((packed))
-#endif
-#define ATTRUNUSED __attribute__((unused))
-#ifdef _XBOX
-#define FILESTAMP I_OutputMsg("%s:%d\n",__FILE__,__LINE__);
-#define XBOXSTATIC static
-#endif
+ #define FUNCNOINLINE __attribute__((noinline))
+
+ #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) // >= GCC 4.4
+ #ifdef __i386__ // i386 only
+ #define FUNCTARGET(X) __attribute__ ((__target__ (X)))
+ #endif
+ #endif
+
+ #if defined (__MINGW32__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) // MinGW, >= GCC 3.4
+ #define ATTRPACK __attribute__((packed, gcc_struct))
+ #else
+ #define ATTRPACK __attribute__((packed))
+ #endif
+
+ #define ATTRUNUSED __attribute__((unused))
+
+ // Xbox-only macros
+ #ifdef _XBOX
+ #define FILESTAMP I_OutputMsg("%s:%d\n",__FILE__,__LINE__);
+ #define XBOXSTATIC static
+ #endif
#elif defined (_MSC_VER)
-#define ATTRNORETURN __declspec(noreturn)
-#define ATTRINLINE __forceinline
-#if _MSC_VER > 1200
-#define ATTRNOINLINE __declspec(noinline)
-#endif
+ #define ATTRNORETURN __declspec(noreturn)
+ #define ATTRINLINE __forceinline
+ #if _MSC_VER > 1200 // >= MSVC 6.0
+ #define ATTRNOINLINE __declspec(noinline)
+ #endif
#endif
#ifndef FUNCPRINTF
@@ -380,4 +363,43 @@ typedef UINT32 tic_t;
#ifndef FILESTAMP
#define FILESTAMP
#endif
+
+/* Miscellaneous types that don't fit anywhere else (Can this be changed?) */
+
+union FColorRGBA
+{
+ UINT32 rgba;
+ struct
+ {
+ UINT8 red;
+ UINT8 green;
+ UINT8 blue;
+ UINT8 alpha;
+ } s;
+} ATTRPACK;
+typedef union FColorRGBA RGBA_t;
+
+typedef enum
+{
+ postimg_none,
+ postimg_water,
+ postimg_motion,
+ postimg_flip,
+ postimg_heat
+} postimg_t;
+
+typedef UINT32 lumpnum_t; // 16 : 16 unsigned long (wad num: lump num)
+#define LUMPERROR UINT32_MAX
+
+typedef UINT32 tic_t;
+#define INFTICS UINT32_MAX
+
+#include "endian.h" // This is needed to make sure the below macro acts correctly in big endian builds
+
+#ifdef SRB2_BIG_ENDIAN
+#define UINT2RGBA(a) a
+#else
+#define UINT2RGBA(a) (UINT32)((a&0xff)<<24)|((a&0xff00)<<8)|((a&0xff0000)>>8)|(((UINT32)a&0xff000000)>>24)
+#endif
+
#endif //__DOOMTYPE__
diff --git a/src/f_finale.c b/src/f_finale.c
index fb1387c11e1a31b147ba93b7b9d3fdfefd126668..a50e4a5be86c3a87f03a587b9c70a02e14fd4c61 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1401,6 +1401,7 @@ void F_StartGameEnd(void)
//
void F_GameEndDrawer(void)
{
+ // this function does nothing
}
//
diff --git a/src/f_finale.h b/src/f_finale.h
index 1f23643bec2bd52a91cd3477ded284eb2a842484..8ee02bdf3d6687d774baaac7f1139b84ec999115 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -35,7 +35,7 @@ void F_CutsceneTicker(void);
void F_TitleDemoTicker(void);
// Called by main loop.
-FUNCMATH void F_GameEndDrawer(void);
+void F_GameEndDrawer(void);
void F_IntroDrawer(void);
void F_TitleScreenDrawer(void);
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 5356ba8acd40e3a765b9fc7e099f3f849d73c7df..a5c81e6e7cfeba09d9a689773b1c771a9220b05e 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -84,7 +84,7 @@ void HU_Init(void);
void HU_LoadGraphics(void);
// reset heads up when consoleplayer respawns.
-FUNCMATH void HU_Start(void);
+void HU_Start(void);
boolean HU_Responder(event_t *ev);
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 620028d81a89ad43df4f00e1d12aa09d12576a1a..56d9b6dae0f39c253bdfecc71fe0bd452f147f02 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -445,7 +445,7 @@ boolean P_SupermanLook4Players(mobj_t *actor);
void P_DestroyRobots(void);
void P_SnowThinker(precipmobj_t *mobj);
void P_RainThinker(precipmobj_t *mobj);
-FUNCMATH void P_NullPrecipThinker(precipmobj_t *mobj);
+void P_NullPrecipThinker(precipmobj_t *mobj);
void P_RemovePrecipMobj(precipmobj_t *mobj);
void P_SetScale(mobj_t *mobj, fixed_t newscale);
void P_XYMovement(mobj_t *mo);
diff --git a/src/r_plane.h b/src/r_plane.h
index 16c8c12a448e6cd5b905b066391404889b0b8eb9..dff58669a49ee14210c1aac6726e291949397649 100644
--- a/src/r_plane.h
+++ b/src/r_plane.h
@@ -87,7 +87,7 @@ extern lighttable_t **planezlight;
extern fixed_t *yslope;
extern fixed_t distscale[MAXVIDWIDTH];
-FUNCMATH void R_InitPlanes(void);
+void R_InitPlanes(void);
void R_PortalStoreClipValues(INT32 start, INT32 end, INT16 *ceil, INT16 *floor, fixed_t *scale);
void R_PortalRestoreClipValues(INT32 start, INT32 end, INT16 *ceil, INT16 *floor, fixed_t *scale);
void R_ClearPlanes(void);
diff --git a/src/r_splats.h b/src/r_splats.h
index c0ba6881c7b384126796a30b9a9c8b5526419844..349d8fa7a4653cbb65874ca87950451f18ac9bbb 100644
--- a/src/r_splats.h
+++ b/src/r_splats.h
@@ -63,11 +63,7 @@ typedef struct floorsplat_s
fixed_t P_SegLength(seg_t *seg);
// call at P_SetupLevel()
-#if !(defined (WALLSPLATS) || defined (FLOORSPLATS))
-FUNCMATH void R_ClearLevelSplats(void);
-#else
void R_ClearLevelSplats(void);
-#endif
#ifdef WALLSPLATS
void R_AddWallSplat(line_t *wallline, INT16 sectorside, const char *patchname, fixed_t top,
diff --git a/src/screen.c b/src/screen.c
index 58c38993be4c81a9e365f75173cc1cec2646fc24..fdd8eb7bd8afadac8e749b7af8fb6bdc174c193a 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -71,11 +71,7 @@ consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NUL
#endif
consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-#ifdef DIRECTFULLSCREEN
-static FUNCMATH void SCR_ChangeFullscreen (void);
-#else
static void SCR_ChangeFullscreen (void);
-#endif
consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
diff --git a/src/sdl/i_cdmus.c b/src/sdl/i_cdmus.c
index 3105f512278e98536de12c9f27e02c5a884e4321..5d086e73a05fdc7d28b23818a9141aa9edc650dc 100644
--- a/src/sdl/i_cdmus.c
+++ b/src/sdl/i_cdmus.c
@@ -12,19 +12,19 @@ consvar_t cd_volume = {"cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL, 0, NUL
consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-FUNCMATH void I_InitCD(void){}
+void I_InitCD(void){}
-FUNCMATH void I_StopCD(void){}
+void I_StopCD(void){}
-FUNCMATH void I_PauseCD(void){}
+void I_PauseCD(void){}
-FUNCMATH void I_ResumeCD(void){}
+void I_ResumeCD(void){}
-FUNCMATH void I_ShutdownCD(void){}
+void I_ShutdownCD(void){}
-FUNCMATH void I_UpdateCD(void){}
+void I_UpdateCD(void){}
-FUNCMATH void I_PlayCD(UINT8 track, UINT8 looping)
+void I_PlayCD(UINT8 track, UINT8 looping)
{
(void)track;
(void)looping;
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 0ec8a980eaaceb01104430a7d5fa934a12ed1d05..5e0bc20e652222650cd7e484fb4aafd878020589 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -1930,14 +1930,14 @@ void I_StartupMouse2(void)
//
// I_Tactile
//
-FUNCMATH void I_Tactile(FFType pFFType, const JoyFF_t *FFEffect)
+void I_Tactile(FFType pFFType, const JoyFF_t *FFEffect)
{
// UNUSED.
(void)pFFType;
(void)FFEffect;
}
-FUNCMATH void I_Tactile2(FFType pFFType, const JoyFF_t *FFEffect)
+void I_Tactile2(FFType pFFType, const JoyFF_t *FFEffect)
{
// UNUSED.
(void)pFFType;
@@ -1948,7 +1948,7 @@ FUNCMATH void I_Tactile2(FFType pFFType, const JoyFF_t *FFEffect)
*/
static ticcmd_t emptycmd;
-FUNCMATH ticcmd_t *I_BaseTiccmd(void)
+ticcmd_t *I_BaseTiccmd(void)
{
return &emptycmd;
}
@@ -1957,7 +1957,7 @@ FUNCMATH ticcmd_t *I_BaseTiccmd(void)
*/
static ticcmd_t emptycmd2;
-FUNCMATH ticcmd_t *I_BaseTiccmd2(void)
+ticcmd_t *I_BaseTiccmd2(void)
{
return &emptycmd2;
}
@@ -2051,7 +2051,7 @@ tic_t I_GetTime (void)
//
//I_StartupTimer
//
-FUNCMATH void I_StartupTimer(void)
+void I_StartupTimer(void)
{
#ifdef _WIN32
// for win2k time bug
@@ -2150,11 +2150,11 @@ void I_WaitVBL(INT32 count)
SDL_Delay(count);
}
-FUNCMATH void I_BeginRead(void)
+void I_BeginRead(void)
{
}
-FUNCMATH void I_EndRead(void)
+void I_EndRead(void)
{
}
@@ -2942,5 +2942,5 @@ const CPUInfoFlags *I_CPUInfo(void)
}
// note CPUAFFINITY code used to reside here
-FUNCMATH void I_RegisterSysCommands(void) {}
+void I_RegisterSysCommands(void) {}
#endif
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index c0ec9988328556e9a8a673dc6b0437f0a6dde57d..3cc29dbb466476461d0daf21458271f739095db3 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1055,7 +1055,7 @@ void I_SetPalette(RGBA_t *palette)
}
// return number of fullscreen + X11 modes
-FUNCMATH INT32 VID_NumModes(void)
+INT32 VID_NumModes(void)
{
if (USE_FULLSCREEN && numVidModes != -1)
return numVidModes - firstEntry;
@@ -1063,7 +1063,7 @@ FUNCMATH INT32 VID_NumModes(void)
return MAXWINMODES;
}
-FUNCMATH const char *VID_GetModeName(INT32 modeNum)
+const char *VID_GetModeName(INT32 modeNum)
{
#if 0
if (USE_FULLSCREEN && numVidModes != -1) // fullscreen modes
@@ -1093,7 +1093,7 @@ FUNCMATH const char *VID_GetModeName(INT32 modeNum)
return &vidModeName[modeNum][0];
}
-FUNCMATH INT32 VID_GetModeForSize(INT32 w, INT32 h)
+INT32 VID_GetModeForSize(INT32 w, INT32 h)
{
int i;
for (i = 0; i < MAXWINMODES; i++)
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index bbd1fcee4597be4ec8240760f2ac9d053222e95d..52a35162297c6504a8bba8caaca942e4c0358eab 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -143,7 +143,7 @@ void I_ShutdownSound(void)
#endif
}
-FUNCMATH void I_UpdateSound(void)
+void I_UpdateSound(void)
{
}
@@ -512,7 +512,7 @@ static void mix_gme(void *udata, Uint8 *stream, int len)
/// Music System
/// ------------------------
-FUNCMATH void I_InitMusic(void)
+void I_InitMusic(void)
{
}
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 9f8a3e29d53f59621f3994cca1279f0f475b5103..f4796cd8067a63056d4157891c2b591b3614b2c2 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -219,7 +219,7 @@ static void Snd_UnlockAudio(void) //Alam: Unlock audio data and reinstall audio
#endif
}
-FUNCMATH static inline Uint16 Snd_LowerRate(Uint16 sr)
+static inline Uint16 Snd_LowerRate(Uint16 sr)
{
if (sr <= audio.freq) // already lowered rate?
return sr; // good then
diff --git a/src/sdl12/sdl_sound.c b/src/sdl12/sdl_sound.c
index 01a27153e8c2941607ca8b206d2e02023a50119d..ed1afd8e23a2981069bcce2afe15f1103cc261bd 100644
--- a/src/sdl12/sdl_sound.c
+++ b/src/sdl12/sdl_sound.c
@@ -236,7 +236,7 @@ static void Snd_UnlockAudio(void) //Alam: Unlock audio data and reinstall audio
#endif
}
-FUNCMATH static inline Uint16 Snd_LowerRate(Uint16 sr)
+static inline Uint16 Snd_LowerRate(Uint16 sr)
{
if (sr <= audio.freq) // already lowered rate?
return sr; // good then
diff --git a/src/st_stuff.h b/src/st_stuff.h
index c11559d2b4f73853972b333d7f4d8dee1d6c9490..6fafca4040f1585c43c50f6449c485e1c1e28e3d 100644
--- a/src/st_stuff.h
+++ b/src/st_stuff.h
@@ -24,7 +24,7 @@
//
// Called by main loop.
-FUNCMATH void ST_Ticker(void);
+void ST_Ticker(void);
// Called by main loop.
void ST_Drawer(void);