Make PseudoramiXExtensionInit() prototype more generally available

Make PseudoramiXExtensionInit() prototype available to hw/xwin

Rather than avoiding a reference to it being pulled in to Xorg by sdksyms by
hiding this prototype behind the INXQUARTZ define, which is only defined when
building Xquartz, introduce nonsdk_extinit.h and move it there.

(The only remaining use of INXQUARTZ is in mi/miiniext.c, in order
to do PseudoramiXExtensionInit() at the point apparently needed by Xquartz)

Also remove duplicate declaration of noPseudoramiXExtension from pseudoramiX.h

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY
2014-11-06 13:54:11 +00:00
parent 3aad9b7556
commit e036cbfccb
6 changed files with 38 additions and 8 deletions

View File

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

View File

@@ -2,8 +2,6 @@
* Minimal implementation of PanoramiX/Xinerama
*/
extern int noPseudoramiXExtension;
void
PseudoramiXAddScreen(int x, int y, int w, int h);
void