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/mischelp.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'common/mischelp.h') diff --git a/common/mischelp.h b/common/mischelp.h index 33739e8bd..0f865e2ef 100644 --- a/common/mischelp.h +++ b/common/mischelp.h @@ -33,10 +33,6 @@ #define LIBJNLIB_MISCHELP_H -/* Because we can't use the internal jnlib_free macro in inline - functions we provide a wrapper function as well. */ -void _jnlib_free (void *p); - /* Check whether the files NAME1 and NAME2 are identical. This is for example achieved by comparing the inode numbers of the files. */ int same_file_p (const char *name1, const char *name2); -- cgit v1.2.3