aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2019-02-25 01:44:16 +0000
committerNIIBE Yutaka <[email protected]>2019-02-25 01:48:12 +0000
commit8161afb9dddaba839be92fbe9d85c05235eda825 (patch)
tree56b1a0f7da7dc82e484ee6209244f41803966e4a
parentgpg: Fix comparison. (diff)
downloadgnupg-8161afb9dddaba839be92fbe9d85c05235eda825.tar.gz
gnupg-8161afb9dddaba839be92fbe9d85c05235eda825.zip
gpgscm: Build well even if NDEBUG defined.
* gpgscm/scheme.c (gc_reservation_failure): Fix adding ";". [!NDEBUG] (scheme_init_custom_alloc): Don't init seserved_lineno. -- Cherry icked from master commit of: e140c6d4f581be1a60a34b67b16430452f3987e8 In some build environment, NDEBUG is defined (although it's bad practice). This change supports such a situation. GnuPG-bug-id: 3959 Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to '')
-rw-r--r--tests/gpgscm/scheme.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index b188e36ce..b4960b0a3 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -874,7 +874,7 @@ gc_reservation_failure(struct scheme *sc)
{
#ifdef NDEBUG
fprintf(stderr,
- "insufficient reservation\n")
+ "insufficient reservation\n");
#else
fprintf(stderr,
"insufficient %s reservation in line %d\n",
@@ -5627,7 +5627,9 @@ int scheme_init_custom_alloc(scheme *sc, func_alloc malloc, func_dealloc free) {
sc->fcells = 0;
sc->inhibit_gc = GC_ENABLED;
sc->reserved_cells = 0;
+#ifndef NDEBUG
sc->reserved_lineno = 0;
+#endif
sc->no_memory=0;
sc->inport=sc->NIL;
sc->outport=sc->NIL;