X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fjmap%2Fjmap.h;h=f1b2f03864aa084e0675dca9c90d13a3b0508a29;hb=f69389e6806e2f0b63084576ffa4c84bba699147;hp=0b389b6079300fb6872b5ea67889acaf141821dc;hpb=7766154ac917ee68545f5dafc481642feb3b85ab;p=ccan

diff --git a/ccan/jmap/jmap.h b/ccan/jmap/jmap.h
index 0b389b60..f1b2f038 100644
--- a/ccan/jmap/jmap.h
+++ b/ccan/jmap/jmap.h
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <ccan/compiler/compiler.h>
 #include <assert.h>
-#ifdef DEBUG
+#ifdef CCAN_JMAP_DEBUG
 #include <stdio.h>
 #endif
 
@@ -39,12 +39,12 @@ struct jmap {
 	const char *errstr;
 	/* Used if !NDEBUG */
 	int num_accesses;
-	/* Used if DEBUG */
+	/* Used if CCAN_JMAP_DEBUG */
 	unsigned long *acc_value;
 	unsigned long acc_index;
 	const char *funcname;
 };
-const char *COLD_ATTRIBUTE jmap_error_(struct jmap *map);
+const char *COLD jmap_error_(struct jmap *map);
 
 /* Debugging checks. */
 static inline void jmap_debug_add_access(const struct jmap *map,
@@ -52,7 +52,7 @@ static inline void jmap_debug_add_access(const struct jmap *map,
 					 unsigned long *val,
 					 const char *funcname)
 {
-#ifdef DEBUG
+#ifdef CCAN_JMAP_DEBUG
 	if (!map->acc_value) {
 		((struct jmap *)map)->acc_value = val;
 		((struct jmap *)map)->acc_index = index;
@@ -66,7 +66,7 @@ static inline void jmap_debug_add_access(const struct jmap *map,
 static inline void jmap_debug_del_access(struct jmap *map, unsigned long **val)
 {
 	assert(--map->num_accesses >= 0);
-#ifdef DEBUG
+#ifdef CCAN_JMAP_DEBUG
 	if (map->acc_value == *val)
 		map->acc_value = NULL;
 #endif
@@ -76,7 +76,7 @@ static inline void jmap_debug_del_access(struct jmap *map, unsigned long **val)
 
 static inline void jmap_debug_access(struct jmap *map)
 {
-#ifdef DEBUG
+#ifdef CCAN_JMAP_DEBUG
 	if (map->num_accesses && map->acc_value)
 		fprintf(stderr,
 			"jmap: still got index %lu, val %lu (%p) from %s\n",