mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-4'
-- Fixed conflicts: NEWS configure.ac doc/gpg.texi
This commit is contained in:
commit
dfa60c09f5
88 changed files with 2655 additions and 1419 deletions
|
@ -366,7 +366,7 @@ gpg_error_t b64decode (const char *string, const char *title,
|
|||
/*-- Simple replacement functions. */
|
||||
|
||||
/* We use the gnupg_ttyname macro to be safe not to run into conflicts
|
||||
which an extisting but broken ttyname. */
|
||||
with an existing but broken ttyname. */
|
||||
#if !defined(HAVE_TTYNAME) || defined(HAVE_BROKEN_TTYNAME)
|
||||
# define gnupg_ttyname(n) _gnupg_ttyname ((n))
|
||||
/* Systems without ttyname (W32) will merely return NULL. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue