From: Marcus Brinkmann Date: Sat, 9 Feb 2002 21:41:46 +0000 (+0000) Subject: Revert last change to this file. X-Git-Tag: V0-3-4~33 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a77a47722b0b56067dd727594208c03691719234;p=gpgme.git Revert last change to this file. --- diff --git a/jnlib/libjnlib-config.h b/jnlib/libjnlib-config.h index ec31d35..de8e6a4 100644 --- a/jnlib/libjnlib-config.h +++ b/jnlib/libjnlib-config.h @@ -26,9 +26,11 @@ #ifndef LIBJNLIB_CONFIG_H #define LIBJNLIB_CONFIG_H -#include /* gcry_malloc & Cie. */ +#include "xmalloc.h" #include "logging.h" + + #ifdef USE_SIMPLE_GETTEXT int set_gettext_file( const char *filename ); const char *gettext( const char *msgid ); @@ -56,11 +58,11 @@ #endif /* !USE_SIMPLE_GETTEXT */ -#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) ) +#define jnlib_xmalloc(a) xmalloc( (a) ) +#define jnlib_xcalloc(a,b) xcalloc( (a), (b) ) +#define jnlib_xrealloc(a,n) xrealloc( (a), (n) ) +#define jnlib_xstrdup(a) xstrdup( (a) ) +#define jnlib_free(a) free( (a) ) #define jnlib_log_debug log_debug #define jnlib_log_info log_info @@ -71,5 +73,3 @@ #endif /*LIBJNUTIL_CONFIG_H*/ - -