From acf3535c75d7c79154b6b89c66567317944d244c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 25 Jul 2013 08:32:37 +0200
Subject: xserver mesa git update 25 Jul 2013

xserver          commit 43ac0491e36cdbb716b5c9d39c97d0aba3bebd75
mesa             commit 8a9df7a370b66ec50b6255e4d66ac1ed331319fb
---
 xorg-server/dix/main.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'xorg-server/dix/main.c')

diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index e69cd931f..05dcbeddd 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -125,14 +125,10 @@ BOOL serverRunning = FALSE;
 pthread_mutex_t serverRunningMutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t serverRunningCond = PTHREAD_COND_INITIALIZER;
 
-int dix_main(int argc, char *argv[], char *envp[]);
+#endif
 
 int
 dix_main(int argc, char *argv[], char *envp[])
-#else
-int
-main(int argc, char *argv[], char *envp[])
-#endif
 {
     int i;
     HWEventQueueType alwaysCheckForInput[2];
-- 
cgit v1.2.3