From ac10f6e3598cc5eef8fe3d4beb2e264189f5908d Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 15 Jun 2007 07:21:01 +0000 Subject: [PATCH] Merged r3075:3076 from branches/SDL-1.2: Careful with __inline__ #define. --- include/begin_code.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/begin_code.h b/include/begin_code.h index aa2f88487..d48a594a3 100644 --- a/include/begin_code.h +++ b/include/begin_code.h @@ -120,7 +120,9 @@ #define SDL_INLINE_OKAY #else #if !defined(__MRC__) && !defined(_SGI_SOURCE) +#ifndef __inline__ #define __inline__ inline +#endif #define SDL_INLINE_OKAY #endif /* Not a funky compiler */ #endif /* Visual C++ */