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:
parent
3aad9b7556
commit
e036cbfccb
|
@ -43,6 +43,7 @@
|
|||
#include "darwinEvents.h"
|
||||
#include "pseudoramiX.h"
|
||||
#include "extension.h"
|
||||
#include "nonsdk_extinit.h"
|
||||
#include "glx_extinit.h"
|
||||
#define _APPLEWM_SERVER_
|
||||
#include "applewmExt.h"
|
||||
|
|
|
@ -33,6 +33,7 @@ sdk_HEADERS = \
|
|||
misc.h \
|
||||
miscstruct.h \
|
||||
opaque.h \
|
||||
nonsdk_extinit.h \
|
||||
optionstr.h \
|
||||
os.h \
|
||||
pixmap.h \
|
||||
|
|
|
@ -163,11 +163,6 @@ extern void SELinuxExtensionInit(void);
|
|||
extern void XTestExtensionInit(void);
|
||||
#endif
|
||||
|
||||
#ifdef INXQUARTZ
|
||||
extern _X_EXPORT Bool noPseudoramiXExtension;
|
||||
extern void PseudoramiXExtensionInit(void);
|
||||
#endif
|
||||
|
||||
#if defined(XV)
|
||||
#include <X11/extensions/Xv.h>
|
||||
#include <X11/extensions/XvMC.h>
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
/***********************************************************
|
||||
|
||||
Copyright 2014 Jon TURNEY
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice (including the next
|
||||
paragraph) shall be included in all copies or substantial portions of the
|
||||
Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
|
||||
#ifndef NONSDK_EXT_INIT_H
|
||||
#define NONSDK_EXT_INIT_H
|
||||
|
||||
/* this is separate from extinit.h to avoid references to these symbols being
|
||||
pulled in by sdksyms */
|
||||
|
||||
extern _X_EXPORT Bool noPseudoramiXExtension;
|
||||
extern void PseudoramiXExtensionInit(void);
|
||||
|
||||
#endif
|
|
@ -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>
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
* Minimal implementation of PanoramiX/Xinerama
|
||||
*/
|
||||
|
||||
extern int noPseudoramiXExtension;
|
||||
|
||||
void
|
||||
PseudoramiXAddScreen(int x, int y, int w, int h);
|
||||
void
|
||||
|
|
Loading…
Reference in New Issue