From 756ccf7af09d35176962e44587244580c2cd0f22 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 27 Sep 2011 09:10:40 +0200
Subject: Do not use LockFile as a variable name since it gives a name
 collision with microsoft header files

---
 xorg-server/os/utils.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'xorg-server/os/utils.c')

diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index 7f2ca2355..8fd034af7 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -242,6 +242,10 @@ OsSignal(int sig, OsSigHandlerPtr handler)
 #define LOCK_PREFIX "/.X"
 #define LOCK_SUFFIX "-lock"
 
+#ifdef _MSC_VER
+#define LockFile szLockFile
+#endif
+
 static Bool StillLocking = FALSE;
 static char LockFile[PATH_MAX];
 static Bool nolock = FALSE;
-- 
cgit v1.2.3