summaryrefslogtreecommitdiff
path: root/com32/include/syslinux
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2011-08-02 00:00:43 +0200
committerMichal Soltys <soltys@ziu.info>2011-08-02 00:00:43 +0200
commitfde23299f87d6d187d3de2318d7fb82dce8090fd (patch)
tree312fb4237bb9d8f885d44b9b0999a4b0a0ee7e4f /com32/include/syslinux
parentd4347ad445ab417946413dd9fcbf6ea2b1e00747 (diff)
parentc210e571f61eeb898fadbb6f47d4a2c82e5bfbfd (diff)
downloadsyslinux-fde23299f87d6d187d3de2318d7fb82dce8090fd.tar.gz
Merge remote-tracking branch 'origin/master' into chaindev
Conflicts: com32/modules/chain.c
Diffstat (limited to 'com32/include/syslinux')
-rw-r--r--com32/include/syslinux/movebits.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/com32/include/syslinux/movebits.h b/com32/include/syslinux/movebits.h
index 54ee7ff9..8bcdf3ed 100644
--- a/com32/include/syslinux/movebits.h
+++ b/com32/include/syslinux/movebits.h
@@ -83,7 +83,12 @@ int syslinux_memmap_find(struct syslinux_memmap *list,
addr_t * start, addr_t * len, addr_t align);
/* Debugging functions */
-void syslinux_dump_movelist(FILE * file, struct syslinux_movelist *ml);
-void syslinux_dump_memmap(FILE * file, struct syslinux_memmap *memmap);
+#ifdef DEBUG
+void syslinux_dump_movelist(struct syslinux_movelist *ml);
+void syslinux_dump_memmap(struct syslinux_memmap *memmap);
+#else
+#define syslinux_dump_movelist(x) ((void)0)
+#define syslinux_dump_memmap(x) ((void)0)
+#endif
#endif /* _SYSLINUX_MOVEBITS_H */