diff options
Diffstat (limited to 'xorg-server/hw/xfree86')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/hw/xfree86/common/compiler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h index 53251298a..4cb127745 100644..100755 --- a/xorg-server/hw/xfree86/common/compiler.h +++ b/xorg-server/hw/xfree86/common/compiler.h @@ -84,7 +84,7 @@ #endif #endif /* __inline__ */ #ifndef __inline -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(_MSC_VER) /* gcc has __inline */ #else #define __inline /**/ @@ -1022,7 +1022,7 @@ 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 #endif /* __GNUC__ */ |