diff options
Diffstat (limited to 'xorg-server/hw/xfree86/common')
| -rw-r--r-- | xorg-server/hw/xfree86/common/compiler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h index c980beeb9..dc6f77318 100644 --- a/xorg-server/hw/xfree86/common/compiler.h +++ b/xorg-server/hw/xfree86/common/compiler.h @@ -86,7 +86,7 @@ #endif #endif /* __inline__ */ #ifndef __inline -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(_MSC_VER) /* gcc has __inline */ #elif defined(__HIGHC__) #define __inline _Inline @@ -1499,10 +1499,10 @@ inl(unsigned short port) #define asm __asm #endif #endif -#if !defined(__SUNPRO_C) +#if !defined(__SUNPRO_C) && !defined(_MSC_VER) #include <sys/inline.h> #endif -#if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \ +#if (!defined(__HIGHC__) && !defined(__SUNPRO_C) && !defined(_MSC_VER)) || \ defined(__USLC__) #pragma asm partial_optimization outl #pragma asm partial_optimization outw |