From 6a9745b567d0500601b5977022b0fc5e1488f5a1 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 1 Oct 2013 14:04:45 +0200
Subject: Solved error due to latest merge

---
 libXrender/src/Xrenderint.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libXrender')

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
-- 
cgit v1.2.3