svn merge ^/branches/released .

1 files changed, 1 insertions, 22 deletions

diff --git a/xorg-server/hw/xfree86/loader/loader.h b/xorg-server/hw/xfree86/loader/loader.h
index 77267f847..a53970b6e 100644
--- a/xorg-server/hw/xfree86/loader/loader.h
+++ b/xorg-server/hw/xfree86/loader/loader.h
@@ -57,23 +57,6 @@
 #include <X11/Xfuncproto.h>

 #include <X11/Xmd.h>

 

-/* LoadModule proc flags; LD_FLAG_GLOBAL adds symbols to global

- * namespace, default is to keep symbols local to module. */

-#define LD_FLAG_GLOBAL 1

-

-typedef struct _loader *loaderPtr;

-

-/* Each module loaded has a loaderRec */

-typedef struct _loader {

-    int handle;			/* Unique id used to remove symbols from

-				 * this module when it is unloaded */

-    int module;			/* Unique id to identify compilation units */

-    char *name;

-    char *cname;

-    void *private;		/* format specific data */

-    loaderPtr next;

-} loaderRec;

-

 /* Compiled-in version information */

 typedef struct {

     int xf86Version;

@@ -88,10 +71,6 @@ extern const ModuleVersions LoaderVersionInfo;
 extern unsigned long LoaderOptions;

 

 /* Internal Functions */

-int LoaderOpen(const char *, const char *, int, int *, int *, int *, int);

-int LoaderHandleOpen(int);

-

-/* Loader backends. */

-#include "dlloader.h"

+void * LoaderOpen(const char *, int *, int *);

 

 #endif /* _LOADER_H */