diff options
| author | Werner Koch <[email protected]> | 2023-11-07 19:07:45 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-11-07 19:38:27 +0000 |
| commit | 387ee7dcbd77d19687af967901ed4818cbdb8b3c (patch) | |
| tree | 3fc63cd303b2d07454794064e4e6528df2dbf42c /g10/gpg.c | |
| parent | doc: Use the em dash to mark a break in a sentence. (diff) | |
| parent | w32: Use utf8 for the asctimestamp function. (diff) | |
| download | gnupg-387ee7dcbd77d19687af967901ed4818cbdb8b3c.tar.gz gnupg-387ee7dcbd77d19687af967901ed4818cbdb8b3c.zip | |
Merge branch 'STABLE-BRANCH-2-4'
* common/b64dec.c (b64decode): Move to ...
* common/miscellaneous.c: here.
* common/t-b64.c: Re-inroduce and keep only the b64decode test code.
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3486,7 +3486,7 @@ main (int argc, char **argv) break; case oUtf8Strings: utf8_strings = 1; break; case oNoUtf8Strings: -#ifdef HAVE_W32_SYSTEM +#ifndef HAVE_W32_SYSTEM utf8_strings = 0; #endif break; |