Revert last change to this file.

diff --git a/trunk/jnlib/libjnlib-config.h b/trunk/jnlib/libjnlib-config.h
index ec31d3561588e2558310606d302e4bd613fd1059..de8e6a478c00c4501a90461965e76224d90660b4 100644 (file)
--- a/trunk/jnlib/libjnlib-config.h
+++ b/trunk/jnlib/libjnlib-config.h
@@ -26,9 +26,11 @@
 #ifndef LIBJNLIB_CONFIG_H
 #define LIBJNLIB_CONFIG_H
 
-#include <gcrypt.h> /* 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*/
 
-
-