diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-27 09:10:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-27 09:10:40 +0200 |
| commit | 756ccf7af09d35176962e44587244580c2cd0f22 (patch) | |
| tree | 9742a1c885e0751bbf1a932075673295a5962108 /xorg-server | |
| parent | 1127a5706784c800af5e597bee475b66ecdad2ae (diff) | |
| download | vcxsrv-756ccf7af09d35176962e44587244580c2cd0f22.tar.gz vcxsrv-756ccf7af09d35176962e44587244580c2cd0f22.tar.bz2 vcxsrv-756ccf7af09d35176962e44587244580c2cd0f22.zip | |
Do not use LockFile as a variable name since it gives a name collision with
microsoft header files
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/os/utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |