aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2001-11-22 10:29:52 +0000
committerWerner Koch <[email protected]>2001-11-22 10:29:52 +0000
commit9ece643cba56a03cf70932545d97cc8fca7a9f9c (patch)
tree8a578690849d2d32ef19b02034e0e7439813ae11
parentNow send the signature back to the calling function (instead of just printing... (diff)
downloadgpgme-9ece643cba56a03cf70932545d97cc8fca7a9f9c.tar.gz
gpgme-9ece643cba56a03cf70932545d97cc8fca7a9f9c.zip
* engine-gpgsm.c: Include more headers so that NULL and mk_error
is defined even with an undefined GPGSM_PATH.
Diffstat (limited to '')
-rw-r--r--gpgme/ChangeLog5
-rw-r--r--gpgme/engine-gpgsm.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index d2707521..fb2ab2d0 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-22 Werner Koch <[email protected]>
+
+ * engine-gpgsm.c: Include more headers so that NULL and mk_error
+ is defined even with an undefined GPGSM_PATH.
+
2001-11-22 Marcus Brinkmann <[email protected]>
* rungpg.c (gpg_inbound_handler, write_mem_data, write_cb_data,
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 87a00393..a27b3545 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -28,17 +28,17 @@
#define ENABLE_GPGSM 1
#endif
-#ifdef ENABLE_GPGSM
-
#include <sys/types.h>
#include <assert.h>
+#ifdef ENABLE_GPGSM
/* FIXME */
#include "../assuan/assuan-defs.h"
#undef xtrymalloc
#undef xtrycalloc
#undef xtryrealloc
#undef xfree
+#endif /*ENABLE_GPGSM*/
#include "gpgme.h"
#include "util.h"
@@ -47,6 +47,8 @@
#include "wait.h"
#include "io.h"
+#ifdef ENABLE_GPGSM
+
#include "engine-gpgsm.h"
#include "assuan.h"