xserver libX11 libXdmcp pixman git update 22-12-2010

2 files changed, 208 insertions, 230 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)