svn merge ^/branches/released .

3 files changed, 632 insertions, 650 deletions

diff --git a/xorg-server/hw/xfree86/loader/loader.c b/xorg-server/hw/xfree86/loader/loader.c
index dce3b22f6..159b61198 100644
--- a/xorg-server/hw/xfree86/loader/loader.c
+++ b/xorg-server/hw/xfree86/loader/loader.c
@@ -1,228 +1,208 @@
-/*

- * Copyright 1995-1998 by Metro Link, Inc.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Metro Link, Inc. not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Metro Link, Inc. makes no

- * representations about the suitability of this software for any purpose.

- *  It is provided "as is" without express or implied warranty.

- *

- * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-/*

- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <errno.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <sys/types.h>

-#include <unistd.h>

-#include <sys/stat.h>

-#include <fcntl.h>

-#include <string.h>

-#include <stdarg.h>

-

-#include "os.h"

-#include "loader.h"

-#include "loaderProcs.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "compiler.h"

-

-#ifdef HAVE_DLFCN_H

-

-#include <dlfcn.h>

-#include <X11/Xos.h>

-

-#if defined(DL_LAZY)

-#define DLOPEN_LAZY DL_LAZY

-#elif defined(RTLD_LAZY)

-#define DLOPEN_LAZY RTLD_LAZY

-#elif defined(__FreeBSD__)

-#define DLOPEN_LAZY 1

-#else

-#define DLOPEN_LAZY 0

-#endif

-

-#if defined(LD_GLOBAL)

-#define DLOPEN_GLOBAL LD_GLOBAL

-#elif defined(RTLD_GLOBAL)

-#define DLOPEN_GLOBAL RTLD_GLOBAL

-#else

-#define DLOPEN_GLOBAL 0

-#endif

-

-#else

-#error i have no dynamic linker and i must scream

-#endif

-

-extern void *xorg_symbols[];

-

-void

-LoaderInit(void)

-{

-    xf86MsgVerb(X_INFO, 2, "Loader magic: %p\n", (void *)xorg_symbols);

-    xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");

-    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,

-		   GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),

-		   GET_ABI_MINOR(LoaderVersionInfo.ansicVersion));

-    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_VIDEODRV,

-		   GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion),

-		   GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion));

-    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_XINPUT,

-		   GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion),

-		   GET_ABI_MINOR(LoaderVersionInfo.xinputVersion));

-    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION,

-		   GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),

-		   GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));

-

-#if defined(__UNIXWARE__) && !defined(__GNUC__)

-    /* For UnixWare we need to load the C Runtime libraries which are

-     * normally auto-linked by the compiler. Otherwise we are bound to

-     * see unresolved symbols when trying to use the type "long long".

-     * Obviously, this does not apply if the GNU C compiler is used.

-     */

-    {

-	int errmaj, errmin, wasLoaded; /* place holders */

-	char *xcrtpath = DEFAULT_MODULE_PATH "/libcrt.a";

-	char *uwcrtpath = "/usr/ccs/lib/libcrt.a";

-	char *path;

-	struct stat st;

-

-	if(stat(xcrtpath, &st) < 0)

-	    path = uwcrtpath; /* fallback: try to get libcrt.a from the uccs */

-	else

-	    path = xcrtpath; /* get the libcrt.a we compiled with */

-	LoaderOpen (path, &errmaj, &errmin, &wasLoaded, 0);

-    }

-#endif

-}

-

-/* Public Interface to the loader. */

-

-void *

-LoaderOpen(const char *module, int *errmaj, int *errmin)

-{

-    void *ret;

-

-#if defined(DEBUG)

-    ErrorF("LoaderOpen(%s)\n", module);

-#endif

-

-    xf86Msg(X_INFO, "Loading %s\n", module);

-

-    if (!(ret = dlopen(module, DLOPEN_LAZY | DLOPEN_GLOBAL))) {

-	xf86Msg(X_ERROR, "Failed to load %s: %s\n", module, dlerror());

-	if (errmaj)

-	    *errmaj = LDR_NOLOAD;

-	if (errmin)

-	    *errmin = LDR_NOLOAD;

-	return NULL;

-    }

-

-    return ret;

-}

-

-void *

-LoaderSymbol(const char *name)

-{

-    static void *global_scope = NULL;

-    void *p;

-

-    p = dlsym(RTLD_DEFAULT, name);

-    if (p != NULL)

-	return p;

-

-    if (!global_scope)

-	global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);

-

-    if (global_scope)

-	return dlsym(global_scope, name);

-

-    return NULL;

-}

-

-void

-LoaderUnload(const char *name, void *handle)

-{

-    xf86Msg(X_INFO, "Unloading %s\n", name);

-    if (handle)

-	dlclose(handle);

-}

-

-unsigned long LoaderOptions = 0;

-

-void

-LoaderSetOptions(unsigned long opts)

-{

-    LoaderOptions |= opts;

-}

-

-Bool

-LoaderShouldIgnoreABI(void)

-{

-    return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0;

-}

-

-int

-LoaderGetABIVersion(const char *abiclass)

-{

-    struct {

-        const char *name;

-        int version;

-    } classes[] = {

-        { ABI_CLASS_ANSIC,     LoaderVersionInfo.ansicVersion },

-        { ABI_CLASS_VIDEODRV,  LoaderVersionInfo.videodrvVersion },

-        { ABI_CLASS_XINPUT,    LoaderVersionInfo.xinputVersion },

-        { ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion },

-        { ABI_CLASS_FONT,      LoaderVersionInfo.fontVersion },

-        { NULL,                0 }

-    };

-    int i;

-

-    for(i = 0; classes[i].name; i++) {

-        if(!strcmp(classes[i].name, abiclass)) {

-            return classes[i].version;

-        }

-    }

-

-    return 0;

-}

+/*
+ * Copyright 1995-1998 by Metro Link, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Metro Link, Inc. not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Metro Link, Inc. makes no
+ * representations about the suitability of this software for any purpose.
+ *  It is provided "as is" without express or implied warranty.
+ *
+ * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+/*
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "os.h"
+#include "loader.h"
+#include "loaderProcs.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "compiler.h"
+
+#ifdef HAVE_DLFCN_H
+
+#include <dlfcn.h>
+#include <X11/Xos.h>
+
+#if defined(DL_LAZY)
+#define DLOPEN_LAZY DL_LAZY
+#elif defined(RTLD_LAZY)
+#define DLOPEN_LAZY RTLD_LAZY
+#elif defined(__FreeBSD__)
+#define DLOPEN_LAZY 1
+#else
+#define DLOPEN_LAZY 0
+#endif
+
+#if defined(LD_GLOBAL)
+#define DLOPEN_GLOBAL LD_GLOBAL
+#elif defined(RTLD_GLOBAL)
+#define DLOPEN_GLOBAL RTLD_GLOBAL
+#else
+#define DLOPEN_GLOBAL 0
+#endif
+
+#else
+#error i have no dynamic linker and i must scream
+#endif
+
+extern void *xorg_symbols[];
+
+void
+LoaderInit(void)
+{
+    xf86MsgVerb(X_INFO, 2, "Loader magic: %p\n", (void *)xorg_symbols);
+    xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");
+    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,
+		   GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),
+		   GET_ABI_MINOR(LoaderVersionInfo.ansicVersion));
+    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_VIDEODRV,
+		   GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion),
+		   GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion));
+    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_XINPUT,
+		   GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion),
+		   GET_ABI_MINOR(LoaderVersionInfo.xinputVersion));
+    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION,
+		   GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),
+		   GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));
+
+}
+
+/* Public Interface to the loader. */
+
+void *
+LoaderOpen(const char *module, int *errmaj, int *errmin)
+{
+    void *ret;
+
+#if defined(DEBUG)
+    ErrorF("LoaderOpen(%s)\n", module);
+#endif
+
+    xf86Msg(X_INFO, "Loading %s\n", module);
+
+    if (!(ret = dlopen(module, DLOPEN_LAZY | DLOPEN_GLOBAL))) {
+	xf86Msg(X_ERROR, "Failed to load %s: %s\n", module, dlerror());
+	if (errmaj)
+	    *errmaj = LDR_NOLOAD;
+	if (errmin)
+	    *errmin = LDR_NOLOAD;
+	return NULL;
+    }
+
+    return ret;
+}
+
+void *
+LoaderSymbol(const char *name)
+{
+    static void *global_scope = NULL;
+    void *p;
+
+    p = dlsym(RTLD_DEFAULT, name);
+    if (p != NULL)
+	return p;
+
+    if (!global_scope)
+	global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
+
+    if (global_scope)
+	return dlsym(global_scope, name);
+
+    return NULL;
+}
+
+void
+LoaderUnload(const char *name, void *handle)
+{
+    xf86Msg(X_INFO, "Unloading %s\n", name);
+    if (handle)
+	dlclose(handle);
+}
+
+unsigned long LoaderOptions = 0;
+
+void
+LoaderSetOptions(unsigned long opts)
+{
+    LoaderOptions |= opts;
+}
+
+Bool
+LoaderShouldIgnoreABI(void)
+{
+    return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0;
+}
+
+int
+LoaderGetABIVersion(const char *abiclass)
+{
+    struct {
+        const char *name;
+        int version;
+    } classes[] = {
+        { ABI_CLASS_ANSIC,     LoaderVersionInfo.ansicVersion },
+        { ABI_CLASS_VIDEODRV,  LoaderVersionInfo.videodrvVersion },
+        { ABI_CLASS_XINPUT,    LoaderVersionInfo.xinputVersion },
+        { ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion },
+        { ABI_CLASS_FONT,      LoaderVersionInfo.fontVersion },
+        { NULL,                0 }
+    };
+    int i;
+
+    for(i = 0; classes[i].name; i++) {
+        if(!strcmp(classes[i].name, abiclass)) {
+            return classes[i].version;
+        }
+    }
+
+    return 0;
+}
diff --git a/xorg-server/hw/xfree86/loader/os.c b/xorg-server/hw/xfree86/loader/os.c
index 5acce0024..6b5ac7e86 100644
--- a/xorg-server/hw/xfree86/loader/os.c
+++ b/xorg-server/hw/xfree86/loader/os.c
@@ -50,8 +50,6 @@
 #define OSNAME "openbsd"
 #elif defined(__GNU__)
 #define OSNAME "hurd"
-#elif defined(__SCO__)
-#define OSNAME "sco"
 #elif defined(SVR4) && defined(sun)
 #define OSNAME "solaris"
 #elif defined(SVR5)
diff --git a/xorg-server/hw/xfree86/loader/sdksyms.sh b/xorg-server/hw/xfree86/loader/sdksyms.sh
index c25aaf010..f60b8ed74 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.sh
+++ b/xorg-server/hw/xfree86/loader/sdksyms.sh
@@ -1,420 +1,424 @@
-#!/bin/sh

-

-cat > sdksyms.c << EOF

-/* This file is automatically generated by sdksyms.sh. */

-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-

-/* These must be included first */

-#include "misc.h"

-#include "miscstruct.h"

-

-

-/* render/Makefile.am */

-#include "picture.h"

-#include "mipict.h"

-#include "glyphstr.h"

-#include "picturestr.h"

-

-

-/* fb/Makefile.am -- module */

-/*

-#include "fb.h"

-#include "fbrop.h"

-#include "fboverlay.h"

-#include "wfbrename.h"

-#include "fbpict.h"

- */

-

-

-/* miext/shadow/Makefile.am -- module */

-/*

-#include "shadow.h"

- */

-

-

-/* miext/damage/Makefile.am */

-#include "damage.h"

-#include "damagestr.h"

-

-/* miext/sync/Makefile.am */

-#include "misync.h"

-#include "misyncstr.h"

-

-/* Xext/Makefile.am -- half is module, half is builtin */

-/*

-#include "xvdix.h"

-#include "xvmcext.h"

- */

-#include "geext.h"

-#include "geint.h"

-#include "shmint.h"

-#include "syncsdk.h"

-#if XINERAMA

-# include "panoramiXsrv.h"

-# include "panoramiX.h"

-#endif

-

-

-/* hw/xfree86/int10/Makefile.am -- module */

-/*

-#include "xf86int10.h"

- */

-

-

-/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */

-#include "xf86i2c.h"

-/*

-#include "bt829.h"

-#include "fi1236.h"

-#include "msp3430.h"

-#include "tda8425.h"

-#include "tda9850.h"

-#include "tda9885.h"

-#include "uda1380.h"

-#include "i2c_def.h"

- */

-

-

-/* hw/xfree86/modes/Makefile.am */

-#include "xf86Crtc.h"

-#include "xf86Modes.h"

-#include "xf86RandR12.h"

-/* #include "xf86Rename.h" */

-

-

-/* hw/xfree86/ddc/Makefile.am */

-#include "edid.h"

-#include "xf86DDC.h"

-

-

-/* hw/xfree86/dri2/Makefile.am -- module */

-/*

-#if DRI2

-# include "dri2.h"

-#endif

- */

-

-

-/* hw/xfree86/vgahw/Makefile.am -- module */

-/*

-#include "vgaHW.h"

- */

-

-

-/* hw/xfree86/fbdevhw/Makefile.am -- module */

-/*

-#include "fbdevhw.h"

- */

-

-

-/* hw/xfree86/common/Makefile.am */

-#include "compiler.h"

-#include "fourcc.h"

-#include "xf86.h"

-#include "xf86Module.h"

-#include "xf86Opt.h"

-#include "xf86PciInfo.h"

-#include "xf86Priv.h"

-#include "xf86Privstr.h"

-#include "xf86cmap.h"

-#include "xf86fbman.h"

-#include "xf86str.h"

-#include "xf86Xinput.h"

-#include "xf86VGAarbiter.h"

-#include "xisb.h"

-#if XV

-# include "xf86xv.h"

-# include "xf86xvmc.h"

-# include "xf86xvpriv.h"

-#endif

-/* XF86VidMode code is in libextmod module */

-/*

-#if XF86VIDMODE

-# include "vidmodeproc.h"

-#endif

- */

-#include "xorgVersion.h"

-#if defined(__sparc__) || defined(__sparc)

-# include "xf86sbusBus.h"

-#endif

-

-

-/* hw/xfree86/ramdac/Makefile.am */

-#include "BT.h"

-#include "IBM.h"

-#include "TI.h"

-#include "xf86Cursor.h"

-#include "xf86RamDac.h"

-

-

-/* hw/xfree86/shadowfb/Makefile.am -- module */

-/*

-#include "shadowfb.h"

- */

-

-

-/* hw/xfree86/os-support/solaris/Makefile.am */

-#if defined(sun386)

-# include "agpgart.h"

-#endif

-

-

-/* hw/xfree86/os-support/Makefile.am */

-#include "xf86_OSproc.h"

-#include "xf86_OSlib.h"

-

-

-/* hw/xfree86/os-support/bus/Makefile.am */

-#include "xf86Pci.h"

-#if defined(__sparc__) || defined(__sparc)

-# include "xf86Sbus.h"

-#endif

-

-

-/* hw/xfree86/xaa/Makefile.am -- module */

-/*

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaarop.h"

- */

-

-

-/* hw/xfree86/dixmods/extmod/Makefile.am -- module */

-/*

-#include "dgaproc.h"

- */

-

-

-/* hw/xfree86/parser/Makefile.am */

-#include "xf86Parser.h"

-#include "xf86Optrec.h"

-

-

-/* hw/xfree86/vbe/Makefile.am -- module */

-/*

-#include "vbe.h"

-#include "vbeModes.h"

- */

-

-

-/* hw/xfree86/dri/Makefile.am -- module */

-/*

-#if XF86DRI

-# include "dri.h"

-# include "sarea.h"

-# include "dristruct.h"

-#endif

- */

-

-

-/* mi/Makefile.am */

-#include "micmap.h"

-#include "miline.h"

-#include "mipointer.h"

-#include "mi.h"

-#include "mibstore.h"

-#include "migc.h"

-#include "mipointrst.h"

-#include "mizerarc.h"

-#include "micoord.h"

-#include "mifillarc.h"

-#include "mispans.h"

-#include "miwideline.h"

-#include "mistruct.h"

-#include "mifpoly.h"

-#include "mioverlay.h"

-

-

-/* randr/Makefile.am */

-#include "randrstr.h"

-#include "rrtransform.h"

-

-

-/* dbe/Makefile.am -- module */

-/*

-#include "dbestruct.h"

- */

-

-

-/* exa/Makefile.am -- module */

-/*

-#include "exa.h"

- */

-

-

-/* xfixes/Makefile.am */

-#include "xfixes.h"

-

-

-/* include/Makefile.am */

-#include "XIstubs.h"

-#include "Xprintf.h"

-#include "closestr.h"

-#include "closure.h"

-#include "colormap.h"

-#include "colormapst.h"

-#include "hotplug.h"

-#include "cursor.h"

-#include "cursorstr.h"

-#include "dix.h"

-#include "dixaccess.h"

-#include "dixevents.h"

-#include "dixfont.h"

-#include "dixfontstr.h"

-#include "dixgrabs.h"

-#include "dixstruct.h"

-#include "exevents.h"

-#include "extension.h"

-#include "extinit.h"

-#include "extnsionst.h"

-#include "gc.h"

-#include "gcstruct.h"

-#include "globals.h"

-#include "input.h"

-#include "inputstr.h"

-/* already included */

-/*

-#include "misc.h"

-#include "miscstruct.h"

- */

-#include "opaque.h"

-#include "os.h"

-#include "pixmap.h"

-#include "pixmapstr.h"

-#include "privates.h"

-#include "property.h"

-#include "propertyst.h"

-#include "ptrveloc.h"

-#include "region.h"

-#include "regionstr.h"

-#include "registry.h"

-#include "resource.h"

-#include "rgb.h"

-#include "screenint.h"

-#include "scrnintstr.h"

-#include "selection.h"

-#include "servermd.h"

-#include "site.h"

-#include "swaprep.h"

-#include "swapreq.h"

-#include "validate.h"

-#include "window.h"

-#include "windowstr.h"

-#include "xace.h"

-#include "xkbfile.h"

-#include "xkbsrv.h"

-#include "xkbstr.h"

-#include "xkbrules.h"

-#include "xserver-properties.h"

-

-EOF

-

-topdir=$1

-shift

-LC_ALL=C

-export LC_ALL

-${CPP:-cpp} "$@" -DXorgLoader sdksyms.c | ${AWK:-awk} -v topdir=$topdir '

-BEGIN {

-    sdk = 0;

-    print("/*");

-    print(" * These symbols are referenced to ensure they");

-    print(" * will be available in the X Server binary.");

-    print(" */");

-    printf("/* topdir=%s */\n", topdir);

-    print("_X_HIDDEN void *xorg_symbols[] = {");

-

-    printf("sdksyms.c:") > "sdksyms.dep";

-}

-/^# [0-9]+ "/ {

-    #   Process text after a include in a relative path or when the

-    # processed file has a basename matching $top_srcdir.

-    #   Note that indexing starts at 1; 0 means no match, and there

-    # is a starting ".

-    sdk = $3 !~ /^"\// || index($3, topdir) == 2;

-

-    if (sdk && $3 ~ /\.h"$/) {

-	# remove quotes

-	gsub(/"/, "", $3);

-	line = $2;

-	header = $3;

-	if (! headers[$3]) {

-	    printf(" \\\n  %s", $3) >> "sdksyms.dep";

-	    headers[$3] = 1;

-	}

-    }

-    next;

-}

-

-/^extern[ 	]/  {

-    if (sdk) {

-	n = 3;

-

-	# skip attribute, if any

-	while ($n ~ /^(__attribute__|__global)/ ||

-	    # skip modifiers, if any

-	    $n ~ /^\*?(unsigned|const|volatile|struct)$/ ||

-	    # skip pointer

-	    $n ~ /\*$/)

-	    n++;

-

-	# type specifier may not be set, as in

-	#   extern _X_EXPORT unsigned name(...)

-	if ($n !~ /[^a-zA-Z0-9_]/)

-	    n++;

-

-	# match

-	#    extern _X_EXPORT type (* name[])(...)

-	if ($n ~ /^[^a-zA-Z0-9_]+$/)

-	    n++;

-

-	# match

-	#	extern _X_EXPORT const name *const ...

-	if ($n ~ /^([^a-zA-Z0-9_]+)?const$/)

-	    n++;

-

-	# actual name may be in the next line, as in

-	#   extern _X_EXPORT type

-	# possibly ending with a *

-	#   name(...)

-	if ($n == "" || $n ~ /^\*+$/) {

-	    getline;

-	    n = 1;

-	}

-

-	# dont modify $0 or $n

-	symbol = $n;

-

-	# remove starting non word chars

-	sub(/^[^a-zA-Z0-9_]+/, "",symbol);

-

-	# remove from first non word to end of line

-	sub(/[^a-zA-Z0-9_].*/, "", symbol);

-

-	#print;

-	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);

-    }

-}

-

-{

-    line++;

-}

-

-END {

-    print("};");

-

-    print("") >> "sdksyms.dep";

-}' > _sdksyms.c

-

-STATUS=$?

-

-cat _sdksyms.c >> sdksyms.c

-rm _sdksyms.c

-

-[ $? != 0 ] && exit $?

-

-exit $STATUS

+#!/bin/sh
+
+cat > sdksyms.c << EOF
+/* This file is automatically generated by sdksyms.sh. */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+
+/* These must be included first */
+#include "misc.h"
+#include "miscstruct.h"
+
+
+/* render/Makefile.am */
+#include "picture.h"
+#include "mipict.h"
+#include "glyphstr.h"
+#include "picturestr.h"
+
+
+/* fb/Makefile.am -- module */
+/*
+#include "fb.h"
+#include "fbrop.h"
+#include "fboverlay.h"
+#include "wfbrename.h"
+#include "fbpict.h"
+ */
+
+
+/* miext/shadow/Makefile.am -- module */
+/*
+#include "shadow.h"
+ */
+
+
+/* miext/damage/Makefile.am */
+#include "damage.h"
+#include "damagestr.h"
+
+/* miext/sync/Makefile.am */
+#include "misync.h"
+#include "misyncstr.h"
+
+/* Xext/Makefile.am -- half is module, half is builtin */
+/*
+#include "xvdix.h"
+#include "xvmcext.h"
+ */
+#include "geext.h"
+#include "geint.h"
+#include "shmint.h"
+#include "syncsdk.h"
+#if XINERAMA
+# include "panoramiXsrv.h"
+# include "panoramiX.h"
+#endif
+
+
+/* hw/xfree86/int10/Makefile.am -- module */
+/*
+#include "xf86int10.h"
+ */
+
+
+/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */
+#include "xf86i2c.h"
+/*
+#include "bt829.h"
+#include "fi1236.h"
+#include "msp3430.h"
+#include "tda8425.h"
+#include "tda9850.h"
+#include "tda9885.h"
+#include "uda1380.h"
+#include "i2c_def.h"
+ */
+
+
+/* hw/xfree86/modes/Makefile.am */
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "xf86RandR12.h"
+/* #include "xf86Rename.h" */
+
+
+/* hw/xfree86/ddc/Makefile.am */
+#include "edid.h"
+#include "xf86DDC.h"
+
+
+/* hw/xfree86/dri2/Makefile.am -- module */
+/*
+#if DRI2
+# include "dri2.h"
+#endif
+ */
+
+
+/* hw/xfree86/vgahw/Makefile.am -- module */
+/*
+#include "vgaHW.h"
+ */
+
+
+/* hw/xfree86/fbdevhw/Makefile.am -- module */
+/*
+#include "fbdevhw.h"
+ */
+
+
+/* hw/xfree86/common/Makefile.am */
+#include "compiler.h"
+#include "fourcc.h"
+#include "xf86.h"
+#include "xf86Module.h"
+#include "xf86Opt.h"
+#include "xf86PciInfo.h"
+#include "xf86Priv.h"
+#include "xf86Privstr.h"
+#include "xf86cmap.h"
+#include "xf86fbman.h"
+#include "xf86str.h"
+#include "xf86Xinput.h"
+#include "xf86VGAarbiter.h"
+#include "xisb.h"
+#if XV
+# include "xf86xv.h"
+# include "xf86xvmc.h"
+# include "xf86xvpriv.h"
+#endif
+/* XF86VidMode code is in libextmod module */
+/*
+#if XF86VIDMODE
+# include "vidmodeproc.h"
+#endif
+ */
+#include "xorgVersion.h"
+#if defined(__sparc__) || defined(__sparc)
+# include "xf86sbusBus.h"
+#endif
+
+
+/* hw/xfree86/ramdac/Makefile.am */
+#include "BT.h"
+#include "IBM.h"
+#include "TI.h"
+#include "xf86Cursor.h"
+#include "xf86RamDac.h"
+
+
+/* hw/xfree86/shadowfb/Makefile.am -- module */
+/*
+#include "shadowfb.h"
+ */
+
+
+/* hw/xfree86/os-support/solaris/Makefile.am */
+#if defined(sun386)
+# include "agpgart.h"
+#endif
+
+
+/* hw/xfree86/os-support/Makefile.am */
+#include "xf86_OSproc.h"
+#include "xf86_OSlib.h"
+
+
+/* hw/xfree86/os-support/bus/Makefile.am */
+#include "xf86Pci.h"
+#if defined(__sparc__) || defined(__sparc)
+# include "xf86Sbus.h"
+#endif
+
+
+/* hw/xfree86/xaa/Makefile.am -- module */
+/*
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaarop.h"
+ */
+
+
+/* hw/xfree86/dixmods/extmod/Makefile.am -- module */
+/*
+#include "dgaproc.h"
+ */
+
+
+/* hw/xfree86/parser/Makefile.am */
+#include "xf86Parser.h"
+#include "xf86Optrec.h"
+
+
+/* hw/xfree86/vbe/Makefile.am -- module */
+/*
+#include "vbe.h"
+#include "vbeModes.h"
+ */
+
+
+/* hw/xfree86/dri/Makefile.am -- module */
+/*
+#if XF86DRI
+# include "dri.h"
+# include "sarea.h"
+# include "dristruct.h"
+#endif
+ */
+
+
+/* mi/Makefile.am */
+#include "micmap.h"
+#include "miline.h"
+#include "mipointer.h"
+#include "mi.h"
+#include "mibstore.h"
+#include "migc.h"
+#include "mipointrst.h"
+#include "mizerarc.h"
+#include "micoord.h"
+#include "mifillarc.h"
+#include "mispans.h"
+#include "miwideline.h"
+#include "mistruct.h"
+#include "mifpoly.h"
+#include "mioverlay.h"
+
+
+/* randr/Makefile.am */
+#include "randrstr.h"
+#include "rrtransform.h"
+
+
+/* dbe/Makefile.am -- module */
+/*
+#include "dbestruct.h"
+ */
+
+
+/* exa/Makefile.am -- module */
+/*
+#include "exa.h"
+ */
+
+
+/* xfixes/Makefile.am */
+#include "xfixes.h"
+
+
+/* include/Makefile.am */
+#include "XIstubs.h"
+#include "Xprintf.h"
+#include "closestr.h"
+#include "closure.h"
+#include "colormap.h"
+#include "colormapst.h"
+#include "hotplug.h"
+#include "cursor.h"
+#include "cursorstr.h"
+#include "dix.h"
+#include "dixaccess.h"
+#include "dixevents.h"
+#include "dixfont.h"
+#include "dixfontstr.h"
+#include "dixgrabs.h"
+#include "dixstruct.h"
+#include "exevents.h"
+#include "extension.h"
+#include "extinit.h"
+#include "extnsionst.h"
+#include "gc.h"
+#include "gcstruct.h"
+#include "globals.h"
+#include "input.h"
+#include "inputstr.h"
+/* already included */
+/*
+#include "misc.h"
+#include "miscstruct.h"
+ */
+#include "opaque.h"
+#include "os.h"
+#include "pixmap.h"
+#include "pixmapstr.h"
+#include "privates.h"
+#include "property.h"
+#include "propertyst.h"
+#include "ptrveloc.h"
+#include "region.h"
+#include "regionstr.h"
+#include "registry.h"
+#include "resource.h"
+#include "rgb.h"
+#include "screenint.h"
+#include "scrnintstr.h"
+#include "selection.h"
+#include "servermd.h"
+#include "site.h"
+#include "swaprep.h"
+#include "swapreq.h"
+#include "validate.h"
+#include "window.h"
+#include "windowstr.h"
+#include "xace.h"
+#include "xkbfile.h"
+#include "xkbsrv.h"
+#include "xkbstr.h"
+#include "xkbrules.h"
+#include "xserver-properties.h"
+
+EOF
+
+topdir=$1
+shift
+LC_ALL=C
+export LC_ALL
+${CPP:-cpp} "$@" -DXorgLoader sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
+BEGIN {
+    sdk = 0;
+    print("/*");
+    print(" * These symbols are referenced to ensure they");
+    print(" * will be available in the X Server binary.");
+    print(" */");
+    printf("/* topdir=%s */\n", topdir);
+    print("_X_HIDDEN void *xorg_symbols[] = {");
+
+    printf("sdksyms.c:") > "sdksyms.dep";
+}
+/^# [0-9]+ "/ {
+    #   Process text after a include in a relative path or when the
+    # processed file has a basename matching $top_srcdir.
+    #   Note that indexing starts at 1; 0 means no match, and there
+    # is a starting ".
+    sdk = $3 !~ /^"\// || index($3, topdir) == 2;
+
+    if (sdk && $3 ~ /\.h"$/) {
+	# remove quotes
+	gsub(/"/, "", $3);
+	line = $2;
+	header = $3;
+	if (! headers[$3]) {
+	    printf(" \\\n  %s", $3) >> "sdksyms.dep";
+	    headers[$3] = 1;
+	}
+    }
+    next;
+}
+
+/^extern[ 	]/  {
+    if (sdk) {
+	n = 3;
+
+	# skip attribute, if any
+	while ($n ~ /^(__attribute__|__global)/ ||
+	    # skip modifiers, if any
+	    $n ~ /^\*?(unsigned|const|volatile|struct)$/ ||
+	    # skip pointer
+	    $n ~ /^[a-zA-Z0-9_]*\*$/)
+	    n++;
+
+	# type specifier may not be set, as in
+	#   extern _X_EXPORT unsigned name(...)
+	if ($n !~ /[^a-zA-Z0-9_]/)
+	    n++;
+
+	# go back if we are at the parameter list already
+	if ($n ~ /^[(]([^*].*)?$/)
+	    n--;
+
+	# match
+	#    extern _X_EXPORT type (* name[])(...)
+	if ($n ~ /^[^a-zA-Z0-9_]+$/)
+	    n++;
+
+	# match
+	#	extern _X_EXPORT const name *const ...
+	if ($n ~ /^([^a-zA-Z0-9_]+)?const$/)
+	    n++;
+
+	# actual name may be in the next line, as in
+	#   extern _X_EXPORT type
+	# possibly ending with a *
+	#   name(...)
+	if ($n == "" || $n ~ /^\*+$/) {
+	    getline;
+	    n = 1;
+	}
+
+	# dont modify $0 or $n
+	symbol = $n;
+
+	# remove starting non word chars
+	sub(/^[^a-zA-Z0-9_]+/, "",symbol);
+
+	# remove from first non word to end of line
+	sub(/[^a-zA-Z0-9_].*/, "", symbol);
+
+	#print;
+	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
+    }
+}
+
+{
+    line++;
+}
+
+END {
+    print("};");
+
+    print("") >> "sdksyms.dep";
+}' > _sdksyms.c
+
+STATUS=$?
+
+cat _sdksyms.c >> sdksyms.c
+rm _sdksyms.c
+
+[ $? != 0 ] && exit $?
+
+exit $STATUS