Merge 621ff230a7 into a8192aa709

dix/dix_priv.h

@@ -75,6 +75,8 @@ extern size_t dixConnBlockScreenStart(const char *connInfo);
 /* only exported for in-tree drivers, not part of public SDK */
 extern _X_EXPORT bool autosetDPI;
 
+extern const char *defaultFontPath;
+
 /*
  * @brief callback right after one screen's root window has been initialized
  *

hw/xfree86/common/xf86Configure.c

@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <stdbool.h>
 
+#include "dix/dix_priv.h"
 #include "include/misc.h"
 #include "os/ddx_priv.h"
 #include "os/mathx_priv.h"

hw/xwin/winconfig.c

@@ -31,6 +31,8 @@
 
 #include <stdbool.h>
 
+#include "dix/dix_priv.h"
+
 #include "win.h"
 #include "winconfig.h"
 #include "winmsg.h"

include/globals.h

@@ -6,7 +6,6 @@
 
 /* Global X server variables that are visible to mi, dix, os, and ddx */
 
-extern _X_EXPORT const char *defaultFontPath;
 extern _X_EXPORT int monitorResolution;
 extern _X_EXPORT int defaultColorVisualClass;