From e216c20f40d51bf3504c36e7311a03bf467fe725 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 27 Oct 2004 16:32:51 +0000 Subject: * dynload.h: Always use it for _WIN32. * LINGUAS: Better don't have comments in this file. * mk-w32-dist: Use utf-8 encoding for all MO files. * simple-gettext.c: Removed windows.h. (get_string): On the fly translation from utf-8 to active character set. * strgutil.c (load_libiconv) [_WIN32]: new. (set_native_charset) [_WIN32]: Call it here and autodetect the used code page. (native_to_utf8, utf8_to_native): Reverted arguments for iconv_open. (handle_iconv_error): Made this function match iconv_open argumnet ordering. (utf8_to_native): Disable all quoting for DELIM == -1. --- include/dynload.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/dynload.h') diff --git a/include/dynload.h b/include/dynload.h index 36dbb8ce9..21e30131e 100644 --- a/include/dynload.h +++ b/include/dynload.h @@ -20,7 +20,7 @@ #ifndef GNUPG_DYNLOAD_H #define GNUPG_DYNLOAD_H -#ifdef ENABLE_CARD_SUPPORT +#if defined (ENABLE_CARD_SUPPORT) || defined(_WIN32) #ifndef _WIN32 #include #else @@ -68,6 +68,6 @@ dlclose (void * hd) } return -1; } -#endif /*__MINGW32__*/ -#endif /*ENABLE_CARD_SUPPORT*/ +#endif /*_WIN32*/ +#endif /*ENABLE_CARD_SUPPORT||_WIN32*/ #endif /*GNUPG_DYNLOAD_H*/ -- cgit v1.2.3