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/libjnlib-config.h | 110 ----------------------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 common/libjnlib-config.h (limited to 'common/libjnlib-config.h') diff --git a/common/libjnlib-config.h b/common/libjnlib-config.h deleted file mode 100644 index 85be87f3e..000000000 --- a/common/libjnlib-config.h +++ /dev/null @@ -1,110 +0,0 @@ -/* libjnlib-config.h - local configuration of the jnlib functions - * Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc. - * - * This file is part of JNLIB, which is a subsystem of GnuPG. - * - * JNLIB is free software; you can redistribute it and/or modify it - * under the terms of either - * - * - the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at - * your option) any later version. - * - * or - * - * - the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * or both in parallel, as here. - * - * JNLIB is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copies of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, see . - */ - -/**************** - * This header is to be included only by the files in this directory - * it should not be used by other modules. - */ - -#ifndef LIBJNLIB_CONFIG_H -#define LIBJNLIB_CONFIG_H - -#include /* gcry_malloc & Cie. */ -#include "logging.h" - -/* We require support for utf-8 conversion. */ -#define JNLIB_NEED_UTF8CONV 1 - - - -#if !defined(JNLIB_NEED_UTF8CONV) && defined(HAVE_W32_SYSTEM) -#define JNLIB_NEED_UTF8CONV 1 -#endif - -/* Gettext stuff */ -#ifdef USE_SIMPLE_GETTEXT -# include -# define _(a) gettext (a) -# define N_(a) (a) - -#else -#ifdef HAVE_LOCALE_H -# include -#endif - -#ifdef ENABLE_NLS -# include -# define _(a) gettext (a) -# ifdef gettext_noop -# define N_(a) gettext_noop (a) -# else -# define N_(a) (a) -# endif -#else -# define _(a) (a) -# define N_(a) (a) -#endif -#endif /* !USE_SIMPLE_GETTEXT */ - -/* Malloc functions to be used by jnlib. */ -#define jnlib_malloc(a) gcry_malloc( (a) ) -#define jnlib_calloc(a,b) gcry_calloc( (a), (b) ) -#define jnlib_realloc(a,b) gcry_realloc( (a), (b) ) -#define jnlib_strdup(a) gcry_strdup( (a) ) -#define jnlib_xmalloc(a) gcry_xmalloc( (a) ) -#define jnlib_xcalloc(a,b) gcry_xcalloc( (a), (b) ) -#define jnlib_xrealloc(a,n) gcry_xrealloc( (a), (n) ) -#define jnlib_xstrdup(a) gcry_xstrdup( (a) ) -#define jnlib_free(a) gcry_free( (a) ) - -/* Logging functions to be used by jnlib. */ -#define jnlib_log_debug log_debug -#define jnlib_log_info log_info -#define jnlib_log_error log_error -#define jnlib_log_fatal log_fatal -#define jnlib_log_bug log_bug - -/* Wrapper to set ERRNO. */ -#ifdef HAVE_W32CE_SYSTEM -# define jnlib_set_errno(e) gpg_err_set_errno ((e)) -#else -# define jnlib_set_errno(e) do { errno = (e); } while (0) -#endif - -/* Dummy replacement for getenv. */ -#ifndef HAVE_GETENV -#define getenv(a) (NULL) -#endif - -#ifdef HAVE_W32CE_SYSTEM -#define getpid() GetCurrentProcessId () -#endif - -#endif /*LIBJNUTIL_CONFIG_H*/ -- cgit v1.2.3