diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-11-06 13:54:11 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-03-16 16:56:17 +0000 |
| commit | e036cbfccbe33775524a469082306913843c63df (patch) | |
| tree | d76b7555a375295f95d0ccf50bd91f61534515ca /pseudoramiX | |
| parent | 3aad9b7556391b0f55e46ba13ced5e58d8fd47f7 (diff) | |
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>
Diffstat (limited to 'pseudoramiX')
| -rw-r--r-- | pseudoramiX/pseudoramiX.c | 2 | ||||
| -rw-r--r-- | pseudoramiX/pseudoramiX.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c index f47c7836d..d0e2603b9 100644 --- a/pseudoramiX/pseudoramiX.c +++ b/pseudoramiX/pseudoramiX.c @@ -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> diff --git a/pseudoramiX/pseudoramiX.h b/pseudoramiX/pseudoramiX.h index f063919dd..5393062ee 100644 --- a/pseudoramiX/pseudoramiX.h +++ b/pseudoramiX/pseudoramiX.h @@ -2,8 +2,6 @@ * Minimal implementation of PanoramiX/Xinerama */ -extern int noPseudoramiXExtension; - void PseudoramiXAddScreen(int x, int y, int w, int h); void |