common: Remove libjnlib-config.h (jnlib merge).
authorWerner Koch <wk@gnupg.org>
Fri, 24 Apr 2015 13:19:10 +0000 (15:19 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 24 Apr 2015 13:19:10 +0000 (15:19 +0200)
commit17bcd087082d01c48c60ff20d7f9a40f34c6969f
tree0fe57bea4c9827cd9bd6b49562c68b36c7046a02
parent154f3ed2bf64de801ae0f9796338a2767ec6357b
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 <wk@gnupg.org>
15 files changed:
common/Makefile.am
common/argparse.c
common/common-defs.h
common/dotlock.c
common/dynload.h
common/libjnlib-config.h [deleted file]
common/logging.c
common/logging.h
common/mischelp.c
common/mischelp.h
common/stringhelp.c
common/strlist.c
common/t-support.c
common/utf8conv.c
common/w32-reg.c