diff options
| author | Werner Koch <[email protected]> | 2007-06-06 18:12:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-06-06 18:12:30 +0000 |
| commit | 2c9791db555cc571eaedfa71444da05454bd052a (patch) | |
| tree | 9566d22f85e562e0c7b35dacc1697c9a58fcff1a /jnlib/libjnlib-config.h | |
| parent | Print passphrase encoding info only in PEM mode. (diff) | |
| download | gnupg-2c9791db555cc571eaedfa71444da05454bd052a.tar.gz gnupg-2c9791db555cc571eaedfa71444da05454bd052a.zip | |
First steps towards supporting W32.
This is mainly source code reorganization.
Update gnulib.
g10/ does currently not build.
Diffstat (limited to '')
| -rw-r--r-- | jnlib/libjnlib-config.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/jnlib/libjnlib-config.h b/jnlib/libjnlib-config.h index 4554b9d1a..6c9408fdb 100644 --- a/jnlib/libjnlib-config.h +++ b/jnlib/libjnlib-config.h @@ -34,11 +34,14 @@ #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 - int set_gettext_file( const char *filename ); - const char *gettext( const char *msgid ); - +# include "w32help.h" # define _(a) gettext (a) # define N_(a) (a) @@ -61,7 +64,9 @@ #endif #endif /* !USE_SIMPLE_GETTEXT */ -/* Malloc functions to be jused by jnlib. */ +/* 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_xmalloc(a) gcry_xmalloc( (a) ) #define jnlib_xcalloc(a,b) gcry_xcalloc( (a), (b) ) #define jnlib_xrealloc(a,n) gcry_xrealloc( (a), (n) ) |