xserver: Branch 'master'

[Keith Packard]

 xkb/ddxLoad.c |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit c6aa4755ec355101a62bef86dbb090262fe806f6
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jan 15 12:13:39 2011 -0800

    xkb/ddxLoad.c doesn't need <paths.h> any more
    
    Was previously used for _PATH_VARTMP, but that was removed in
    534fc5140b039a8c98ab715d0a6740d513b41209
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index e6904a5..51b5777 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -45,10 +45,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XI.h>
 #include "xkb.h"
 
-#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
-#include <paths.h>
-#endif
-
 	/*
 	 * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
 	 * relative to the top-level XKB configuration directory.