Merge remote-tracking branch 'origin/released'

* origin/released:
  xserver mesa git update 25 Jul 2013

Conflicts:
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c

7 files changed, 42 insertions, 7 deletions

diff --git a/xorg-server/dix/Makefile.am b/xorg-server/dix/Makefile.am
index b7358aa72..e7ca2369c 100644
--- a/xorg-server/dix/Makefile.am
+++ b/xorg-server/dix/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = $(DIX_CFLAGS)
 
 libmain_la_SOURCES =    \
-	main.c
+	stubmain.c
 
 libdix_la_SOURCES = 	\
 	atom.c		\
@@ -14,6 +14,7 @@ libdix_la_SOURCES = 	\
 	dispatch.c	\
 	dispatch.h	\
 	dixfonts.c	\
+	main.c		\
 	dixutils.c	\
 	enterleave.c	\
 	enterleave.h	\
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index d3aa7cfec..d3aa7cfec 100755..100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index b2b770d1c..b2b770d1c 100755..100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index f92bfe024..374ec2cf7 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -129,14 +129,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];
diff --git a/xorg-server/dix/makefile b/xorg-server/dix/makefile
index a7e9e3249..d201695e8 100644
--- a/xorg-server/dix/makefile
+++ b/xorg-server/dix/makefile
@@ -5,6 +5,8 @@ endif
 INCLUDES += ..\composite ..\miext\sync

 

 LIBRARY=libdix

+libmain_la_SOURCES =    \

+	stubmain.c

 

 libdix_la_SOURCES = 	\

 	atom.c		\

@@ -14,6 +16,7 @@ libdix_la_SOURCES = 	\
 	dispatch.c	\

 	dispatch.h	\

 	dixfonts.c	\

+	main.c		\

 	dixutils.c	\

 	enterleave.c	\

 	enterleave.h	\

@@ -42,4 +45,4 @@ libdix_la_SOURCES = 	\
 	touch.c		\

 	window.c

 

-CSRCS = $(filter %.c,$(libdix_la_SOURCES))

+CSRCS = $(filter %.c,$(libdix_la_SOURCES)) $(filter %.c,$(libmain_la_SOURCES))

diff --git a/xorg-server/dix/registry.c b/xorg-server/dix/registry.c
index ce741c28e..ce741c28e 100755..100644
--- a/xorg-server/dix/registry.c
+++ b/xorg-server/dix/registry.c
diff --git a/xorg-server/dix/stubmain.c b/xorg-server/dix/stubmain.c
new file mode 100644
index 000000000..7efb4b8e7
--- /dev/null
+++ b/xorg-server/dix/stubmain.c
@@ -0,0 +1,35 @@
+/***********************************************************
+
+Copyright 2012 Jon TURNEY
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+******************************************************************/
+
+int dix_main(int argc, char *argv[], char *envp[]);
+
+/*
+  A default implementation of main, which can be overridden by the DDX
+ */
+int
+main(int argc, char *argv[], char *envp[])
+{
+    return dix_main(argc, argv, envp);
+}