From 65b4aa242a07b617563cfa88795e67a86055e737 Mon Sep 17 00:00:00 2001 From: tjw Date: Fri, 19 Jan 2007 19:31:19 +0000 Subject: * (bug 2977) use MSVC compatiable pre-processors and also include for int types git-svn-id: svn://svn.icculus.org/quake3/trunk@1034 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/qcommon/q_shared.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index f58d282..7dc87dc 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -114,18 +114,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifdef Q3_VM typedef int intptr_t; #else -# ifndef _MSC_VER -# include -# else - typedef __int64 int64_t; - typedef __int32 int32_t; - typedef __int16 int16_t; - typedef __int8 int8_t; - typedef unsigned __int64 uint64_t; - typedef unsigned __int32 uint32_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int8 uint8_t; -# endif + #ifndef _MSC_VER + #include + #else + #include + typedef __int64 int64_t; + typedef __int32 int32_t; + typedef __int16 int16_t; + typedef __int8 int8_t; + typedef unsigned __int64 uint64_t; + typedef unsigned __int32 uint32_t; + typedef unsigned __int16 uint16_t; + typedef unsigned __int8 uint8_t; + #endif #endif typedef unsigned char byte; -- cgit v1.2.3