From 9df4292a9141525a8caf23f9ce92a210b1b6b71b Mon Sep 17 00:00:00 2001 From: sezero Date: Fri, 31 Oct 2014 13:03:20 +0000 Subject: [PATCH] a few more minor stuff from uhexen2 svn git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1133 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/q_stdinc.h | 8 ++------ quakespasm/Quake/quakedef.h | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/quakespasm/Quake/q_stdinc.h b/quakespasm/Quake/q_stdinc.h index bec23916..5e93990b 100644 --- a/quakespasm/Quake/q_stdinc.h +++ b/quakespasm/Quake/q_stdinc.h @@ -172,6 +172,7 @@ typedef int fixed16_t; /*==========================================================================*/ +/* missing types */ #if defined(_MSC_VER) #if defined(_WIN64) #define ssize_t SSIZE_T @@ -180,12 +181,7 @@ typedef int ssize_t; #endif /* _WIN64 */ #endif /* _MSC_VER */ -/* compatibility with M$ types */ -#if !defined(_WIN32) -#define PASCAL -#define FAR -#define APIENTRY -#endif /* ! WINDOWS */ +/*==========================================================================*/ #if !defined(__GNUC__) #define __attribute__(x) diff --git a/quakespasm/Quake/quakedef.h b/quakespasm/Quake/quakedef.h index 9cff4679..8f3da6fb 100644 --- a/quakespasm/Quake/quakedef.h +++ b/quakespasm/Quake/quakedef.h @@ -224,6 +224,9 @@ typedef struct #include "SDL.h" #include "SDL_opengl.h" #endif +#ifndef APIENTRY +#define APIENTRY +#endif #include "console.h" #include "wad.h"