aboutsummaryrefslogtreecommitdiffstats
path: root/src/setenv.c
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2010-05-06 13:39:55 +0000
committerMarcus Brinkmann <[email protected]>2010-05-06 13:39:55 +0000
commit749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5 (patch)
tree5e43ee1064a9e68208c7ab288e08e89c814caa5f /src/setenv.c
parent2010-04-19 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5.tar.gz
gpgme-749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5.zip
2010-05-06 Marcus Brinkmann <[email protected]>
* configure.ac: Require libgpg-error 1.8. src/ 2010-05-06 Marcus Brinkmann <[email protected]> * 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 <gpg-error.h> 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.
Diffstat (limited to 'src/setenv.c')
-rw-r--r--src/setenv.c9
1 files changed, 3 insertions, 6 deletions
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 <config.h>
#endif
+#include <gpg-error.h>
+#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 <errno.h>
-#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 <stdlib.h>