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 /jnlib | |
| 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 'jnlib')
| -rw-r--r-- | jnlib/ChangeLog | 7 | ||||
| -rw-r--r-- | jnlib/logging.c | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index 65e7d4786..68340896c 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,8 @@ +2006-11-15 Werner Koch <wk@g10code.com> + + * logging.c (my_funopen_hook_ret_t): New. + (fun_writer): Use it. + 2006-10-19 Werner Koch <wk@g10code.com> * stringhelp.c (memrchr) [!HAVE_MEMRCHR]: Provide a replacement. @@ -5,7 +10,7 @@ 2006-09-27 Werner Koch <wk@g10code.com> * mischelp.c: New. - (timegm): Copied from gnupg 1.4, Changed from LGPL to GPL. Fixed + (timegm): Copied from gnupg 1.4, changed from GPL to LGPL. Fixed a memory leak. * stringhelp.h (isascii): New. diff --git a/jnlib/logging.c b/jnlib/logging.c index dce5ab2ea..0df4422b0 100644 --- a/jnlib/logging.c +++ b/jnlib/logging.c @@ -48,6 +48,13 @@ #define USE_FUNWRITER 1 #endif +#ifdef HAVE_FOPENCOOKIE +typedef ssize_t my_funopen_hook_ret_t; +#else +typedef int my_funopen_hook_ret_t; +#endif + + static FILE *logstream; static int log_socket = -1; static char prefix_buffer[80]; @@ -111,7 +118,7 @@ writen (int fd, const void *buffer, size_t nbytes) } -static int +static my_funopen_hook_ret_t fun_writer (void *cookie_arg, const char *buffer, size_t size) { struct fun_cookie_s *cookie = cookie_arg; |