|
|
@ -37,12 +37,6 @@ EXIV2_RCSID("@(#) $Id$")
|
|
|
|
# include "exv_conf.h"
|
|
|
|
# include "exv_conf.h"
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(__MINGW32__) || defined(__MINGW64__)
|
|
|
|
|
|
|
|
# ifndef __MINGW__
|
|
|
|
|
|
|
|
# define __MINGW__
|
|
|
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(__CYGWIN__) || defined(__MINGW__)
|
|
|
|
#if defined(__CYGWIN__) || defined(__MINGW__)
|
|
|
|
#include <windows.h>
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -240,7 +234,7 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
|
|
|
|
struct lmap* pl;
|
|
|
|
struct lmap* pl;
|
|
|
|
void* ph = dlopen(NULL, RTLD_NOW);
|
|
|
|
void* ph = dlopen(NULL, RTLD_NOW);
|
|
|
|
struct something* p = (struct something*) ph;
|
|
|
|
struct something* p = (struct something*) ph;
|
|
|
|
|
|
|
|
|
|
|
|
p = p->ptr;
|
|
|
|
p = p->ptr;
|
|
|
|
pl = (struct lmap*)p->ptr;
|
|
|
|
pl = (struct lmap*)p->ptr;
|
|
|
|
|
|
|
|
|
|
|
@ -267,7 +261,7 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
|
|
|
|
for ( string_i lib = libs.begin()+1 ; lib != libs.end() ; lib++ )
|
|
|
|
for ( string_i lib = libs.begin()+1 ; lib != libs.end() ; lib++ )
|
|
|
|
os << "library=" << *lib << endl;
|
|
|
|
os << "library=" << *lib << endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(__linux__)
|
|
|
|
#if defined(__linux__)
|
|
|
|
dlclose(ph);
|
|
|
|
dlclose(ph);
|
|
|
|
ph=NULL;
|
|
|
|
ph=NULL;
|
|
|
|