From 749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 6 May 2010 13:39:55 +0000 Subject: 2010-05-06 Marcus Brinkmann * configure.ac: Require libgpg-error 1.8. src/ 2010-05-06 Marcus Brinkmann * sign.c, data-user.c, conversion.c, debug.c, verify.c, data.c, decrypt.c, delete.c, assuan-support.c, import.c, engine-gpgsm.c, data-mem.c, op-support.c, w32-io.c, w32-util.c, data-compat.c: Use gpg_error_from_syserror instead gpg_error_from_errno, and use gpg_err_set_errno to set error number. * setenv.c: Include and define __set_errno to use gpg_err_set_errno. * gpgme-tool.c (ARGP_ERR_UNKNOWN): Define to EDEADLOCK (which is mapped in Windows CE) instead of E2BIG (which is not). (gt_import_keys): Initialize err. --- src/setenv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/setenv.c') diff --git a/src/setenv.c b/src/setenv.c index d3a54c14..5a7e638b 100644 --- a/src/setenv.c +++ b/src/setenv.c @@ -20,6 +20,9 @@ # include #endif +#include +#define __set_errno(ev) (gpg_err_set_errno (ev)) + #if HAVE_ASSUAN_H /* Fixme: Why do we need to include the assuan header and why the internal ones? */ @@ -29,12 +32,6 @@ #define __builtin_expect(cond,val) (cond) #include -#if !_LIBC -# if !defined errno && !defined HAVE_ERRNO_DECL -extern int errno; -# endif -# define __set_errno(ev) ((errno) = (ev)) -#endif #if _LIBC || HAVE_STDLIB_H # include -- cgit v1.2.3