aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--include/hex_conversion.h2
-rw-r--r--include/trace_macros.h (renamed from include/output.h)4
-rw-r--r--src/mem_internal_check.c2
-rw-r--r--src/split_for_sort.c2
-rw-r--r--src/tree_based_check.c2
6 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 08a3fcd..3deee66 100644
--- a/Makefile
+++ b/Makefile
@@ -39,24 +39,24 @@ out/debug: out
# Lazy, not splitting compiler & linker calls
out/mem_internal_check: out src/mem_internal_check.c \
- include/output.h include/hex_conversion.h
+ include/trace_macros.h include/hex_conversion.h
${CC} -o $@ ${CFLAGS} ${PROD_CFLAGS} src/mem_internal_check.c
out/debug/mem_internal_check: out/debug src/mem_internal_check.c \
- include/output.h include/hex_conversion.h
+ include/trace_macros.h include/hex_conversion.h
${CC} -o $@ ${CFLAGS} ${DEBUG_CFLAGS} src/mem_internal_check.c
-out/split_for_sort: out src/split_for_sort.c include/output.h
+out/split_for_sort: out src/split_for_sort.c include/trace_macros.h
${CC} -o $@ ${CFLAGS} ${PROD_CFLAGS} src/split_for_sort.c
-out/debug/split_for_sort: out/debug src/split_for_sort.c include/output.h
+out/debug/split_for_sort: out/debug src/split_for_sort.c include/trace_macros.h
${CC} -o $@ ${CFLAGS} ${DEBUG_CFLAGS} src/split_for_sort.c
out/tree_based_check: out src/tree_based_check.c \
- include/output.h include/hex_conversion.h
+ include/trace_macros.h include/hex_conversion.h
${CC} -o $@ ${CFLAGS} ${PROD_CFLAGS} src/tree_based_check.c
out/debug/tree_based_check: out/debug src/tree_based_check.c \
- include/output.h include/hex_conversion.h
+ include/trace_macros.h include/hex_conversion.h
${CC} -o $@ ${CFLAGS} ${DEBUG_CFLAGS} src/tree_based_check.c
diff --git a/include/hex_conversion.h b/include/hex_conversion.h
index 483cf26..ddeb131 100644
--- a/include/hex_conversion.h
+++ b/include/hex_conversion.h
@@ -12,7 +12,7 @@
#include <ctype.h>
#ifdef DEBUGBUILD
-#include "output.h"
+#include "trace_macros.h"
#endif
#define ishex_macro(c) ((c>='0' && c <= '9') || (c>='A' && c <= 'F') || (c>='a' && c <= 'f'))
diff --git a/include/output.h b/include/trace_macros.h
index 366e3c4..9fd6a73 100644
--- a/include/output.h
+++ b/include/trace_macros.h
@@ -4,8 +4,8 @@
*
* vim:ts=4:sw=4:expandtab
*/
-#ifndef OUTPUT_H
-#define OUTPUT_H
+#ifndef TRACE_MACROS_H
+#define TRACE_MACROS_H
#include <stdio.h>
diff --git a/src/mem_internal_check.c b/src/mem_internal_check.c
index 080230c..bda270e 100644
--- a/src/mem_internal_check.c
+++ b/src/mem_internal_check.c
@@ -22,7 +22,7 @@
#include <sys/mman.h>
#include <sys/stat.h>
-#include "output.h"
+#include "trace_macros.h"
#include "hex_conversion.h"
#include "time_utils.h"
diff --git a/src/split_for_sort.c b/src/split_for_sort.c
index aa9be90..fa8e187 100644
--- a/src/split_for_sort.c
+++ b/src/split_for_sort.c
@@ -17,7 +17,7 @@
#include <sys/resource.h>
#include <sys/stat.h>
-#include "output.h"
+#include "trace_macros.h"
/* Also used for paths => at least PATH_MAX */
#define BUFFERSIZE 4096
diff --git a/src/tree_based_check.c b/src/tree_based_check.c
index e999707..0cb9ea9 100644
--- a/src/tree_based_check.c
+++ b/src/tree_based_check.c
@@ -20,7 +20,7 @@
#include <ctype.h>
#include <inttypes.h>
-#include "output.h"
+#include "trace_macros.h"
#include "hex_conversion.h"