From baf2dd4c7e2b8ace04e32a40375b5deb7b908196 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 13 Feb 2014 11:05:34 -0800 Subject: [PATCH] Back out changelist 1951976 --- include/SDL_loadso.h | 10 ---------- src/loadso/dlopen/SDL_sysloadso.c | 7 ------- src/loadso/windows/SDL_sysloadso.c | 16 ---------------- 3 files changed, 33 deletions(-) diff --git a/include/SDL_loadso.h b/include/SDL_loadso.h index 50df510d8..0359eae17 100644 --- a/include/SDL_loadso.h +++ b/include/SDL_loadso.h @@ -57,16 +57,6 @@ extern "C" { */ extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile); -/** - * This function returns a handle to an already-loaded shared object and - * returns a pointer to the object handle. If the object file was not loaded - * the function returns NULL. This function adds a reference to the shared - * object, so the caller should call SDL_UnloadObject when they are finished - * with this reference to ensure that the object can be unloaded. - * The 'sofile' parameter is a system dependent name of the object file. - */ -extern DECLSPEC void *SDLCALL SDL_GetLoadedObject(const char *sofile); - /** * Given an object handle, this function looks up the address of the * named function in the shared object and returns it. This address diff --git a/src/loadso/dlopen/SDL_sysloadso.c b/src/loadso/dlopen/SDL_sysloadso.c index 79df107f0..db8422221 100644 --- a/src/loadso/dlopen/SDL_sysloadso.c +++ b/src/loadso/dlopen/SDL_sysloadso.c @@ -41,13 +41,6 @@ SDL_LoadObject(const char *sofile) return (handle); } -void * -SDL_GetLoadedObject(const char *sofile) -{ - void *handle = dlopen(sofile, RTLD_NOLOAD); - return (handle); -} - void * SDL_LoadFunction(void *handle, const char *name) { diff --git a/src/loadso/windows/SDL_sysloadso.c b/src/loadso/windows/SDL_sysloadso.c index 4ff36af0e..cbbd92978 100644 --- a/src/loadso/windows/SDL_sysloadso.c +++ b/src/loadso/windows/SDL_sysloadso.c @@ -46,22 +46,6 @@ SDL_LoadObject(const char *sofile) return handle; } -void * -SDL_GetLoadedObject(const char *sofile) -{ - LPTSTR tstr = WIN_UTF8ToString(sofile); - void *handle = (void *) GetModuleHandle(tstr); - - /* if we got a handle, call LoadLibrary to get - * it again with the ref count incremented. - * We do this to match the dlopen version of this function */ - handle = (void *)LoadLibrary( tstr ); - - SDL_free(tstr); - - return handle; -} - void * SDL_LoadFunction(void *handle, const char *name) {