diff options
author | Werner Koch <[email protected]> | 2015-04-24 13:19:10 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2015-04-24 13:19:10 +0000 |
commit | 17bcd087082d01c48c60ff20d7f9a40f34c6969f (patch) | |
tree | 0fe57bea4c9827cd9bd6b49562c68b36c7046a02 /common/t-support.c | |
parent | gpg: Move all DNS access to Dirmngr. (diff) | |
download | gnupg-17bcd087082d01c48c60ff20d7f9a40f34c6969f.tar.gz gnupg-17bcd087082d01c48c60ff20d7f9a40f34c6969f.zip |
common: Remove libjnlib-config.h (jnlib merge).
* common/libjnlib-config.h: Remove.
* common/common-defs.h (getenv) [HAVE_GETENV]: New. From removed
header.
(getpid) [HAVE_W32CE_SYSTEM]: New. From removed header.
* common/argparse.c: Include util.h and common-defs.h. Replace
jnlib_ macro names for non-GNUPG builds by x* names.
* common/dotlock.c: Ditto.
* common/logging.c: Include util.h and common-defs.h. Replace jnlib_
symbol names by x* names.
* common/strlist.c: Ditto.
* common/utf8conv.c: Ditto.
* common/w32-reg.c: Ditto.
* common/mischelp.c: Ditto. Also remove _jnlib_free.
* common/stringhelp.c: Ditto.
(JNLIB_LOG_WITH_PREFIX): Do not depend on this macro.
* common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this
macro.
--
This is part 1 of the patches to merge the jnlib files into common/.
It does not make much sense to keep jnlib/ files separate. They are
not often use elsewhere and maintaining the complex marcos stuff is
too troublesome for the future.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/t-support.c')
-rw-r--r-- | common/t-support.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/common/t-support.c b/common/t-support.c index f8b087de1..aa95a06d8 100644 --- a/common/t-support.c +++ b/common/t-support.c @@ -128,9 +128,7 @@ gcry_free (void *a) /* Stubs for gpg-error functions required because some compilers do not eliminate the supposed-to-be-unused-inline-functions and thus - require functions called from these inline fucntions. Although we - do not use gpg-error, gpg-error.h may get included via gcrypt.h if - it happens to be used used in libjnlib-config.h. */ + require functions called from these inline functions. */ #ifndef GPG_ERROR_H /* Don't do this if gpg-error.h has been included. */ int gpg_err_code_from_errno (int err) |