diff options
| author | Werner Koch <wk@gnupg.org> | 2021-03-04 10:49:02 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-03-04 10:50:07 +0100 |
| commit | 3bf1de7b72be8e1d9fa78eb94730772d9cf61c44 (patch) | |
| tree | 0bef6e6705948f61eb937810bf2ef926deafcc89 | |
| parent | 1fb90a7da186ee2ee098a666f6f3a35bb1720e59 (diff) | |
| download | libgpg-error-3bf1de7b72be8e1d9fa78eb94730772d9cf61c44.tar.gz | |
w32: Minor cleanup of w32-gettext
* src/w32-gettext.c: Include gpgrt.h instead gpg-error.h.
(utf8_to_wchar): Use underscored function.
(_gpg_w32_textdomain): Ditto.
--
| -rw-r--r-- | src/argparse.c | 3 | ||||
| -rw-r--r-- | src/w32-gettext.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/argparse.c b/src/argparse.c index e116fff..cb5c58c 100644 --- a/src/argparse.c +++ b/src/argparse.c @@ -2685,6 +2685,9 @@ _gpgrt_usage (int level) * First char is '1': * The short usage notes needs to be printed * before the long usage note. + * 95: Application flag string + * First character is '1': + * On Windows enable argument globbing */ const char * _gpgrt_strusage (int level) diff --git a/src/w32-gettext.c b/src/w32-gettext.c index 569b126..e8bdb54 100644 --- a/src/w32-gettext.c +++ b/src/w32-gettext.c @@ -51,7 +51,7 @@ #endif /*!jnlib_malloc*/ #include "init.h" -#include "gpg-error.h" +#include "gpgrt-int.h" #include "protos.h" /* Override values initialized by gpgrt_w32_override_locale. If NAME @@ -1378,7 +1378,7 @@ utf8_to_wchar (const char *string, size_t length, size_t *retlen) nbytes = (size_t)(n+1) * sizeof(*result); if (nbytes / sizeof(*result) != (n+1)) { - gpg_err_set_errno (ENOMEM); + _gpg_err_set_errno (ENOMEM); return NULL; } result = jnlib_malloc (nbytes); @@ -1922,7 +1922,7 @@ _gpg_w32_textdomain (const char *domainname) if (!domainname) { if (!current_domainname) - gpg_err_set_errno (0); + _gpg_err_set_errno (0); } else { |