xserver: Branch 'master' - 2 commits

[Jon TURNEY]

 .gitignore                 |    1 +
 hw/xwin/winmultiwindowwm.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit af6152499654a7146250d4ad0df89f611345434e
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Wed Dec 17 14:15:34 2008 +0000

    Cygwin/X: Add *.exe pattern to .gitignore
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/.gitignore b/.gitignore
index e16bb48..bd38ddb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ Makefile.in
 *.pbxuser
 *.mode1v3
 *.patch
+*.exe
 obj*
 build*
 cscope*
commit 8428b92fcb478b041f778c0e8c66fdeb96c807f3
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Sun Jan 4 20:12:16 2009 +0000

    Xming: Fix a couple of warnings
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index 7e00fb8..ca9460a 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -798,6 +798,7 @@ winMultiWindowWMProc (void *pArg)
 #if CYGMULTIWINDOW_DEBUG
   ErrorF("-winMultiWindowWMProc ()\n");
 #endif
+  return NULL;
 }
 
 
@@ -1058,7 +1059,7 @@ winMultiWindowXMsgProc (void *pArg)
 
   XCloseDisplay (pProcArg->pDisplay);
   pthread_exit (NULL);
- 
+  return NULL;
 }