From 47913e82955ec8e2b1ba4d4b145497dede9163b5 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 16 Dec 2011 20:45:15 +0100
Subject: xserver git update 16 dec 2011

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

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

diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index b49fd3251..6461ed591 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -248,7 +248,7 @@ LockServer(void)
 {
   char tmp[PATH_MAX], pid_str[12];
   int lfd, i, haslock, l_pid, t;
-  char *tmppath = NULL;
+  const char *tmppath = LOCK_DIR;
   int len;
   char port[20];
 
@@ -256,8 +256,6 @@ LockServer(void)
   /*
    * Path names
    */
-  tmppath = LOCK_DIR;
-
   snprintf(port, sizeof(port), "%d", atoi(display));
   len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) :
 						strlen(LOCK_TMP_PREFIX);
-- 
cgit v1.2.3