aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-30 14:40:29 +0200
committermarha <marha@users.sourceforge.net>2012-05-30 14:40:29 +0200
commitcdb76f76457c170cc61f040aea1a48517488cb46 (patch)
tree619806e79b757c71a7e3efba63807fa5e5afac38 /xorg-server
parentc229f618dd10327675815351ad67f5533f283a9c (diff)
downloadvcxsrv-cdb76f76457c170cc61f040aea1a48517488cb46.tar.gz
vcxsrv-cdb76f76457c170cc61f040aea1a48517488cb46.tar.bz2
vcxsrv-cdb76f76457c170cc61f040aea1a48517488cb46.zip
Update filesthatshouldbethesame.py and synchronised files
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/glx/dispatch.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 7ba5334ce..d78ce73c6 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -48,8 +48,10 @@
#endif
#ifdef _MSC_VER
+#ifndef INLINE
#define INLINE __inline
#endif
+#endif
#define CALL_by_offset(disp, cast, offset, parameters) \
(*(cast (GET_by_offset(disp, offset)))) parameters
#define GET_by_offset(disp, offset) \