[PR #1384] pseudoramiX: unexport noPseudoramiXExtension

PR: #1384

Author: metux

hw/xquartz/quartz.c

@@ -35,6 +35,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "quartzRandR.h"
 #include "inputstr.h"
@@ -43,7 +44,6 @@
 #include "darwinEvents.h"
 #include "pseudoramiX.h"
 #include "extension.h"
-#include "nonsdk_extinit.h"
 #include "glx_extinit.h"
 #define _APPLEWM_SERVER_
 #include "applewmExt.h"

hw/xquartz/xpr/xprScreen.c

@@ -32,6 +32,7 @@
 #include <dix-config.h>
 
 #include "dix/screenint_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "inputstr.h"
 #include "quartz.h"
@@ -53,9 +54,6 @@
 #include "damage.h"
 #endif
 
-#include "nonsdk_extinit.h"
-#include "miext/extinit_priv.h"
-
 /* 10.4's deferred update makes X slower.. have to live with the tearing
  * for now.. */
 #define XP_NO_DEFERRED_UPDATES 8

hw/xwin/InitOutput.c

@@ -61,7 +61,6 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
 #endif
 
 #include "winmonitors.h"
-#include "nonsdk_extinit.h"
 #include "pseudoramiX/pseudoramiX.h"
 
 #include "glx_extinit.h"

include/meson.build

@@ -463,7 +463,6 @@ if build_xorg
             'misc.h',
             'miscstruct.h',
             'opaque.h',
-            'nonsdk_extinit.h',
             'optionstr.h',
             'os.h',
             'pixmap.h',

include/nonsdk_extinit.h

@@ -29,6 +29,8 @@ extern Bool noNamespaceExtension;
 
 extern Bool PanoramiXExtensionDisabledHack;
 
+extern Bool noPseudoramiXExtension;
+
 extern char *namespaceConfigFile;
 
 void CompositeExtensionInit(void);

miext/extinit_priv.h

@@ -43,7 +43,6 @@
 
 #include "pseudoramiX.h"
 #include "extnsionst.h"
-#include "nonsdk_extinit.h"
 #include "dixstruct.h"
 #include "window.h"
 #include <X11/extensions/panoramiXproto.h>