diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xfree86/loader/loader.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/loader/loader.c')
| -rw-r--r-- | xorg-server/hw/xfree86/loader/loader.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/xorg-server/hw/xfree86/loader/loader.c b/xorg-server/hw/xfree86/loader/loader.c index a00269b70..fc0db2886 100644 --- a/xorg-server/hw/xfree86/loader/loader.c +++ b/xorg-server/hw/xfree86/loader/loader.c @@ -63,7 +63,7 @@ #include <string.h> #if defined(linux) && \ (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \ - || defined(__amd64__) || defined(__x86_64__)) + || defined(__amd64__)) #include <malloc.h> #endif #include <stdarg.h> @@ -76,11 +76,6 @@ #include "compiler.h" #include "sym.h" -#if defined(Lynx) && defined(sun) -/* Cross build machine doesn;t have strerror() */ -#define strerror(err) "strerror unsupported" -#endif - /* * handles are used to identify files that are loaded. Even archives * are counted as a single file. @@ -113,8 +108,7 @@ LoaderInit(void) xf86MsgVerb(X_INFO, 2, "Loader magic: %p\n", (void *) ((long)dixLookupTab ^ (long)extLookupTab - ^ (long)fontLookupTab ^ (long)miLookupTab - ^ (long)xfree86LookupTab)); + ^ (long)miLookupTab ^ (long)xfree86LookupTab)); xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n"); xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC, GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion), @@ -128,9 +122,6 @@ LoaderInit(void) xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION, GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion), GET_ABI_MINOR(LoaderVersionInfo.extensionVersion)); - xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_FONT, - GET_ABI_MAJOR(LoaderVersionInfo.fontVersion), - GET_ABI_MINOR(LoaderVersionInfo.fontVersion)); LoaderGetOS(&osname, NULL, NULL, NULL); if (osname) @@ -258,7 +249,7 @@ LoaderOpen(const char *module, const char *cname, int handle, * Find a free handle. */ new_handle = 1; - while (freeHandles[new_handle] && new_handle < MAX_HANDLE) + while (new_handle < MAX_HANDLE && freeHandles[new_handle]) new_handle++; if (new_handle == MAX_HANDLE) { @@ -363,6 +354,12 @@ LoaderSetOptions(unsigned long opts) LoaderOptions |= opts; } +_X_EXPORT Bool +LoaderShouldIgnoreABI(void) +{ + return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0; +} + _X_EXPORT int LoaderGetABIVersion(const char *abiclass) { |