diff options
| author | Werner Koch <[email protected]> | 2020-10-23 18:14:45 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-10-23 18:16:18 +0000 |
| commit | 32f336d9555f18464d72a5068c290ab82ee92617 (patch) | |
| tree | e6199576ff091fc57e64430564cf54691fd47884 | |
| parent | scd: Handle Yubikey's multiple apps and serialno. (diff) | |
| download | gnupg-32f336d9555f18464d72a5068c290ab82ee92617.tar.gz gnupg-32f336d9555f18464d72a5068c290ab82ee92617.zip | |
common: Allow building with released libgpg-error.
* common/sysutils.c (gnupg_access) [W32]: Fix for older libgpgrt.
--
Fixes-commit: c94ee1386e0d5cdac51086c4d5b92de59c09c9b5
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | common/sysutils.c | 16 | ||||
| -rw-r--r-- | doc/HACKING | 3 | ||||
| -rw-r--r-- | scd/ccid-driver.h | 1 |
3 files changed, 12 insertions, 8 deletions
diff --git a/common/sysutils.c b/common/sysutils.c index 25de374a3..45a6d8c80 100644 --- a/common/sysutils.c +++ b/common/sysutils.c @@ -1105,22 +1105,24 @@ gnupg_getcwd (void) gpg_err_code_t gnupg_access (const char *name, int mode) { -#if GPGRT_VERSION_NUMBER < 0x012800 /* 1.39 */ +#if GPGRT_VERSION_NUMBER < 0x012800 /* 1.40 */ # ifdef HAVE_W32_SYSTEM - wchar_t *wfname; + wchar_t *wname; + gpg_err_code_t ec; - wfname = utf8_to_wchar (fname); - if (!wfname) + wname = utf8_to_wchar (name); + if (!wname) ec = gpg_err_code_from_syserror (); else { - ec = _waccess (wfname, mode)? gpg_err_code_from_syserror () : 0; - xfree (wfname); + ec = _waccess (wname, mode)? gpg_err_code_from_syserror () : 0; + xfree (wname); } + return ec; # else return access (name, mode)? gpg_err_code_from_syserror () : 0; # endif -#else +#else /* gpgrt 1.40 or newer. */ return gpgrt_access (name, mode); #endif } diff --git a/doc/HACKING b/doc/HACKING index 0f8f84e5c..3d57ea634 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -227,7 +227,8 @@ Note that such a comment will be removed if the git commit option - Some-comments-by :: Name or mail address of the author of additional comments (commit log or code). - Proofread-by :: Sometimes used by translation commits. - - Signed-off-by :: Name or mail address of the developer + - Signed-off-by :: Name or mail address of the developer. + - Backported-from-master :: Value is the commit id of the original patch. * Windows ** How to build an installer for Windows diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h index dc17c27a2..232483544 100644 --- a/scd/ccid-driver.h +++ b/scd/ccid-driver.h @@ -77,6 +77,7 @@ enum { #define SCM_SCR331 0xe001 #define SCM_SCR331DI 0x5111 #define SCM_SCR335 0x5115 +#define SCM_SCR3310 0x5116 /* @MAXX Basic */ #define SCM_SCR3320 0x5117 #define SCM_SPR532 0xe003 /* Also used succeeding model SPR332. */ #define CHERRY_ST2000 0x003e |