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

---
 apps/xhost/xhost.c          | 4 ++++
 libXaw/src/Vendor.c         | 3 +--
 libXrender/src/Xrenderint.h | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/xhost/xhost.c b/apps/xhost/xhost.c
index a6baa9dbf..44d85a09e 100755
--- a/apps/xhost/xhost.c
+++ b/apps/xhost/xhost.c
@@ -92,6 +92,10 @@ X Window System is a trademark of The Open Group.
 #include <arpa/inet.h>
 #endif
 
+#ifdef _MSC_VER
+#define _X_UNUSED
+#endif
+
 
 #ifdef SECURE_RPC
 #include <pwd.h>
diff --git a/libXaw/src/Vendor.c b/libXaw/src/Vendor.c
index 0ce5b6def..a2554daff 100755
--- a/libXaw/src/Vendor.c
+++ b/libXaw/src/Vendor.c
@@ -111,13 +111,12 @@ static XtResource resources[] = {
  *
  ***************************************************************************/
 
-#if defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_MSC_VER)
 /* to fix the EditRes problem because of wrong linker semantics */
 extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */
 extern VendorShellClassRec _XawVendorShellClassRec;
 extern void _XawFixupVendorShell();
 
-#if defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_MSC_VER)
 int __stdcall
 DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
 {
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