diff --git a/common/dynload.h b/common/dynload.h index 54a47b219..f1dc3f095 100644 --- a/common/dynload.h +++ b/common/dynload.h @@ -1,97 +1,100 @@ /* dynload.h - Wrapper functions for run-time dynamic loading * Copyright (C) 2003, 2010 Free Software Foundation, Inc. * * This file is part of GnuPG. * * GnuPG is free software; you can redistribute and/or modify this * part of GnuPG under the terms of either * * - the GNU Lesser General Public License as published by the Free * Software Foundation; either version 3 of the License, or (at * your option) any later version. * * or * * - the GNU General Public License as published by the Free * Software Foundation; either version 2 of the License, or (at * your option) any later version. * * or both in parallel, as here. * * GnuPG is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copies of the GNU General Public License * and the GNU Lesser General Public License along with this program; * if not, see . */ #ifndef GNUPG_COMMON_DYNLOAD_H #define GNUPG_COMMON_DYNLOAD_H #ifndef __MINGW32__ # include #else +# ifdef HAVE_WINSOCK2_H +# include /* needs to be included before windows.h */ +# endif # include # include "utf8conv.h" # include "mischelp.h" # define RTLD_LAZY 0 static inline void * dlopen (const char *name, int flag) { void *hd; #ifdef HAVE_W32CE_SYSTEM wchar_t *wname = utf8_to_wchar (name); hd = wname? LoadLibrary (wname) : NULL; xfree (wname); #else hd = LoadLibrary (name); #endif (void)flag; return hd; } static inline void * dlsym (void *hd, const char *sym) { if (hd && sym) { #ifdef HAVE_W32CE_SYSTEM wchar_t *wsym = utf8_to_wchar (sym); void *fnc = wsym? GetProcAddress (hd, wsym) : NULL; xfree (wsym); #else void *fnc = GetProcAddress (hd, sym); #endif if (!fnc) return NULL; return fnc; } return NULL; } static inline const char * dlerror (void) { static char buf[32]; snprintf (buf, sizeof buf, "ec=%lu", GetLastError ()); return buf; } static inline int dlclose (void * hd) { if (hd) { CloseHandle (hd); return 0; } return -1; } # endif /*__MINGW32__*/ #endif /*GNUPG_COMMON_DYNLOAD_H*/