dix: unexport MakeWindowOptional()

Really internal, should not be used by drivers.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/shape.c

@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include "dix/dix_priv.h"
 #include "dix/gc_priv.h"
+#include "dix/window_priv.h"
 #include "miext/extinit_priv.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"

Xi/exevents.c

@@ -97,6 +97,7 @@ SOFTWARE.
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "dix/resource_priv.h"
+#include "dix/window_priv.h"
 #include "mi/mi_priv.h"
 #include "os/log_priv.h"
 #include "xkb/xkbsrv_priv.h"

dix/events.c

@@ -127,6 +127,7 @@ Equipment Corporation.
 #include "dix/input_priv.h"
 #include "dix/reqhandlers_priv.h"
 #include "dix/resource_priv.h"
+#include "dix/window_priv.h"
 #include "os/bug_priv.h"
 #include "os/client_priv.h"
 #include "os/fmt.h"

dix/grabs.c

@@ -56,6 +56,7 @@ SOFTWARE.
 #include "dix/dixgrabs_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/resource_priv.h"
+#include "dix/window_priv.h"
 #include "os/auth.h"
 #include "os/client_priv.h"
 

dix/property.c

@@ -52,6 +52,7 @@ SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "dix/property_priv.h"
+#include "dix/window_priv.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"
 

dix/window_priv.h

@@ -31,5 +31,14 @@ WindowPtr dixCreateWindow(Window wid,
                           ClientPtr client,
                           VisualID visual,
                           int * error);
+/*
+ * @brief Make sure the window->optional structure exists.
+ *
+ * allocate if window->optional == NULL, otherwise do nothing.
+ *
+ * @param pWin the window to operate on
+ * @return FALSE if allocation failed, otherwise TRUE
+ */
+Bool MakeWindowOptional(WindowPtr pWin);
 
 #endif /* _XSERVER_DIX_WINDOW_PRIV_H */

include/window.h

@@ -190,8 +190,6 @@ extern _X_EXPORT WindowPtr FindWindowWithOptional(WindowPtr /*w */ );
 
 extern _X_EXPORT void CheckWindowOptionalNeed(WindowPtr /*w */ );
 
-extern _X_EXPORT Bool MakeWindowOptional(WindowPtr /*pWin */ );
-
 extern _X_EXPORT WindowPtr MoveWindowInStack(WindowPtr /*pWin */ ,
                                              WindowPtr /*pNextSib */ );
 

xfixes/region.c

@@ -23,6 +23,7 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "dix/window_priv.h"
 #include "render/picturestr_priv.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"