From 17bcd087082d01c48c60ff20d7f9a40f34c6969f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 24 Apr 2015 15:19:10 +0200 Subject: 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 --- common/dynload.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/dynload.h') diff --git a/common/dynload.h b/common/dynload.h index e029b2b36..1d7966e60 100644 --- a/common/dynload.h +++ b/common/dynload.h @@ -46,7 +46,7 @@ dlopen (const char *name, int flag) #ifdef HAVE_W32CE_SYSTEM wchar_t *wname = utf8_to_wchar (name); hd = wname? LoadLibrary (wname) : NULL; - _jnlib_free (wname); + xfree (wname); #else hd = LoadLibrary (name); #endif @@ -62,7 +62,7 @@ dlsym (void *hd, const char *sym) #ifdef HAVE_W32CE_SYSTEM wchar_t *wsym = utf8_to_wchar (sym); void *fnc = wsym? GetProcAddress (hd, wsym) : NULL; - _jnlib_free (wsym); + xfree (wsym); #else void *fnc = GetProcAddress (hd, sym); #endif -- cgit v1.2.3