diff options
| author | Werner Koch <wk@gnupg.org> | 2006-11-20 17:49:41 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2006-11-20 17:49:41 +0100 |
| commit | 5885142c83823b153689acd272103403127a3cd3 (patch) | |
| tree | 514e8325f9201775785b3249b176e9ac051776ff /common | |
| parent | No need for thsi script. Use ./autogen.sh --build-w32 instead. (diff) | |
| download | gnupg2-5885142c83823b153689acd272103403127a3cd3.tar.xz gnupg2-5885142c83823b153689acd272103403127a3cd3.zip | |
Made some PIN pads work.
Some cleanups for 64 bit CPUs.
Diffstat (limited to 'common')
| -rw-r--r-- | common/ChangeLog | 8 | ||||
| -rw-r--r-- | common/estream.c | 13 | ||||
| -rw-r--r-- | common/iobuf.c | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 25af94867..5ff12da97 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,11 @@ +2006-11-15 Werner Koch <wk@g10code.com> + + * estream.c: Disabled Pth soft mapping. + (my_funopen_hook_ret_t): New. + (print_fun_writer): Use it here. + + * iobuf.c (fd_cache_close): Use %d instead of %p for debug output. + 2006-11-03 Werner Koch <wk@g10code.com> * Makefile.am (t_convert_DEPENDENCIES): Add libcommon. From diff --git a/common/estream.c b/common/estream.c index e056cb7b4..e00191e53 100644 --- a/common/estream.c +++ b/common/estream.c @@ -46,6 +46,9 @@ #endif #ifdef HAVE_PTH + /* We explicitly need to disable soft mapping as Debian currently + enables it for no reason. */ +# define PTH_SYSCALL_SOFT 0 # include <pth.h> #endif @@ -59,6 +62,7 @@ void *memrchr (const void *block, int c, size_t size); #include <estream.h> + /* Generally used types. */ @@ -66,6 +70,13 @@ void *memrchr (const void *block, int c, size_t size); typedef void *(*func_realloc_t) (void *mem, size_t size); typedef void (*func_free_t) (void *mem); +#ifdef HAVE_FOPENCOOKIE +typedef ssize_t my_funopen_hook_ret_t; +#else +typedef int my_funopen_hook_ret_t; +#endif + + /* Buffer management layer. */ @@ -1651,7 +1662,7 @@ doreadline (estream_t ES__RESTRICT stream, size_t max_length, /* Helper for esprint. */ #if defined(HAVE_FOPENCOOKIE) || defined(HAVE_FUNOPEN) -static int +static my_funopen_hook_ret_t print_fun_writer (void *cookie_arg, const char *buffer, size_t size) { estream_t stream = cookie_arg; diff --git a/common/iobuf.c b/common/iobuf.c index 113d35bb4..c01702696 100644 --- a/common/iobuf.c +++ b/common/iobuf.c @@ -271,7 +271,7 @@ fd_cache_close (const char *fname, FILEP_OR_FD fp) close (fp); #endif if (DBG_IOBUF) - log_debug ("fd_cache_close (%p) real\n", (void *) fp); + log_debug ("fd_cache_close (%d) real\n", fp); return; } /* try to reuse a slot */ |