diff options
| author | Werner Koch <[email protected]> | 2006-08-01 12:23:34 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-08-01 12:23:34 +0000 |
| commit | 8c219602515ae1dba5bc0da31077852dab61809e (patch) | |
| tree | 49d596d702cfec2b8cc42ccaf8c90c82d5200ac5 /common/dynload.h | |
| parent | Forgot this one. (diff) | |
| parent | 2006-07-29 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-8c219602515ae1dba5bc0da31077852dab61809e.tar.gz gnupg-8c219602515ae1dba5bc0da31077852dab61809e.zip | |
Moved 1.9 branch to trunk
Diffstat (limited to '')
| -rw-r--r-- | common/dynload.h (renamed from include/dynload.h) | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/dynload.h b/common/dynload.h index acdf5c879..9b67fa9ed 100644 --- a/include/dynload.h +++ b/common/dynload.h @@ -21,23 +21,22 @@ #ifndef GNUPG_DYNLOAD_H #define GNUPG_DYNLOAD_H -#if defined (ENABLE_CARD_SUPPORT) || defined(_WIN32) -#ifndef _WIN32 +#ifndef __MINGW32__ #include <dlfcn.h> #else #include <windows.h> #define RTLD_LAZY 0 -static __inline__ void * +static inline void * dlopen (const char * name, int flag) { void * hd = LoadLibrary (name); return hd; } -static __inline__ void * -dlsym (void * hd, const char * sym) +static inline void * +dlsym (void *hd, const char *sym) { if (hd && sym) { @@ -50,23 +49,24 @@ dlsym (void * hd, const char * sym) } -static __inline__ const char * +static inline const char * dlerror (void) { - return w32_strerror (0); + static char buf[32]; + sprintf (buf, "ec=%lu", GetLastError ()); + return buf; } -static __inline__ int +static inline int dlclose (void * hd) { if (hd) { - FreeLibrary (hd); + CloseHandle (hd); return 0; } return -1; } -#endif /*_WIN32*/ -#endif /*ENABLE_CARD_SUPPORT||_WIN32*/ +#endif /*__MINGW32__*/ #endif /*GNUPG_DYNLOAD_H*/ |