aboutsummaryrefslogtreecommitdiff
path: root/libXrender/src/Xrenderint.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-01 14:04:45 +0200
committermarha <marha@users.sourceforge.net>2013-10-01 14:04:45 +0200
commit6a9745b567d0500601b5977022b0fc5e1488f5a1 (patch)
tree0b1b60872ea994870f4e61c2e9affe56a6c6d133 /libXrender/src/Xrenderint.h
parentbe0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (diff)
downloadvcxsrv-6a9745b567d0500601b5977022b0fc5e1488f5a1.tar.gz
vcxsrv-6a9745b567d0500601b5977022b0fc5e1488f5a1.tar.bz2
vcxsrv-6a9745b567d0500601b5977022b0fc5e1488f5a1.zip
Solved error due to latest merge
Diffstat (limited to 'libXrender/src/Xrenderint.h')
-rw-r--r--libXrender/src/Xrenderint.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libXrender/src/Xrenderint.h b/libXrender/src/Xrenderint.h
index daaa6fe10..aca5d4f8d 100644
--- a/libXrender/src/Xrenderint.h
+++ b/libXrender/src/Xrenderint.h
@@ -113,6 +113,10 @@ XRenderFindDisplay (Display *dpy);
#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */
#include <limits.h>
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
static inline void _XEatDataWords(Display *dpy, unsigned long n)
{
# ifndef LONG64