frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xf86: Re-export extension disable flags 

These flags were unexported by commit a1d41e311c,
which moved the declarations around and lost the _X_EXPORT attributes in the
process.  Since drivers need these and it's late in the release cycle, just
re-export them for now.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Aaron Plattner 2012-07-16 17:40:31 -07:00 committed by Keith Packard
parent d5977e5bd2
commit 5884e7dede
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/common/xf86Extensions.h
View File

@ -29,25 +29,25 @@
#include "extnsionst.h"
#ifdef XF86DRI
extern Bool noXFree86DRIExtension;
extern _X_EXPORT Bool noXFree86DRIExtension;
extern void XFree86DRIExtensionInit(void);
#endif
#ifdef DRI2
#include <X11/extensions/dri2proto.h>
extern Bool noDRI2Extension;
extern _X_EXPORT Bool noDRI2Extension;
extern void DRI2ExtensionInit(void);
#endif
#ifdef XF86VIDMODE
#include <X11/extensions/xf86vmproto.h>
extern Bool noXFree86VidModeExtension;
extern _X_EXPORT Bool noXFree86VidModeExtension;
extern void XFree86VidModeExtensionInit(void);
#endif
#ifdef XFreeXDGA
#include <X11/extensions/xf86dgaproto.h>
extern Bool noXFree86DGAExtension;
extern _X_EXPORT Bool noXFree86DGAExtension;
extern void XFree86DGAExtensionInit(void);
extern void XFree86DGARegister(void);
#endif

32
include/extinit.h
View File

@ -54,17 +54,17 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "extnsionst.h"
#ifdef COMPOSITE
extern Bool noCompositeExtension;
extern _X_EXPORT Bool noCompositeExtension;
extern void CompositeExtensionInit(void);
#endif
#ifdef DAMAGE
extern Bool noDamageExtension;
extern _X_EXPORT Bool noDamageExtension;
extern void DamageExtensionInit(void);
#endif
#if defined(DBE)
extern Bool noDbeExtension;
extern _X_EXPORT Bool noDbeExtension;
extern void DbeExtensionInit(void);
#endif
@ -74,7 +74,7 @@ extern void DMXExtensionInit(void);
#if defined(DPMSExtension)
#include <X11/extensions/dpmsconst.h>
extern Bool noDPMSExtension;
extern _X_EXPORT Bool noDPMSExtension;
extern void DPMSExtensionInit(void);
#endif
@ -88,12 +88,12 @@ extern void GlxExtensionInit(void);
#ifdef PANORAMIX
#include <X11/extensions/panoramiXproto.h>
extern Bool noPanoramiXExtension;
extern _X_EXPORT Bool noPanoramiXExtension;
extern void PanoramiXExtensionInit(void);
#endif
#ifdef RANDR
extern Bool noRRExtension;
extern _X_EXPORT Bool noRRExtension;
extern void RRExtensionInit(void);
#endif
@ -101,18 +101,18 @@ extern void RRExtensionInit(void);
extern void RecordExtensionInit(void);
#endif
extern Bool noRenderExtension;
extern _X_EXPORT Bool noRenderExtension;
extern void RenderExtensionInit(void);
#if defined(RES)
#include <X11/extensions/XResproto.h>
extern Bool noResExtension;
extern _X_EXPORT Bool noResExtension;
extern void ResExtensionInit(void);
#endif
#if defined(SCREENSAVER)
#include <X11/extensions/saver.h>
extern Bool noScreenSaverExtension;
extern _X_EXPORT Bool noScreenSaverExtension;
extern void ScreenSaverExtensionInit(void);
#endif
@ -122,7 +122,7 @@ extern void ShapeExtensionInit(void);
#ifdef MITSHM
#include <X11/extensions/shm.h>
#include <X11/extensions/shmproto.h>
extern Bool noMITShmExtension;
extern _X_EXPORT Bool noMITShmExtension;
extern void ShmExtensionInit(void);
#endif
@ -133,20 +133,20 @@ extern void XCMiscExtensionInit(void);
#ifdef XCSECURITY
#include <X11/extensions/secur.h>
#include "securitysrv.h"
extern Bool noSecurityExtension;
extern _X_EXPORT Bool noSecurityExtension;
extern void SecurityExtensionInit(void);
#endif
#ifdef XF86BIGFONT
#include <X11/extensions/xf86bigfproto.h>
extern Bool noXFree86BigfontExtension;
extern _X_EXPORT Bool noXFree86BigfontExtension;
extern void XFree86BigfontExtensionInit(void);
#endif
extern void BigReqExtensionInit(void);
#ifdef XFIXES
extern Bool noXFixesExtension;
extern _X_EXPORT Bool noXFixesExtension;
extern void XFixesExtensionInit(void);
#endif
@ -160,7 +160,7 @@ extern void XkbExtensionInit(void);
#if defined(XSELINUX)
#include "xselinux.h"
extern Bool noSELinuxExtension;
extern _X_EXPORT Bool noSELinuxExtension;
extern void SELinuxExtensionInit(void);
#endif
@ -171,14 +171,14 @@ extern void XTestExtensionInit(void);
#endif
#ifdef INXQUARTZ
extern Bool noPseudoramiXExtension;
extern _X_EXPORT Bool noPseudoramiXExtension;
extern void PseudoramiXExtensionInit(void);
#endif
#if defined(XV)
#include <X11/extensions/Xv.h>
#include <X11/extensions/XvMC.h>
extern Bool noXvExtension;
extern _X_EXPORT Bool noXvExtension;
extern void XvExtensionInit(void);
extern void XvMCExtensionInit(void);
#endif