@@ -10,10 +10,13 @@
 
 #ifndef LC_LINEBUF_LEN
 #define LC_LINEBUF_LEN 1024
 #endif
 
+#ifndef HAVE_STRTOULL
+#include "strtoull.h"
+#endif
 #ifndef HAVE_STRSEP
 #include "strsep.h"
 #endif
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
@@ -75,31 +78,6 @@
 #else
 #include <time.h>
 #endif
 #endif
 
-#ifdef DEBUG
-#define PRINT_LINE fprintf(stderr, "%lu:%s:%i:%s(): ", (unsigned long) time(NULL), __FILE__, __LINE__, __func__); 
-#define PRINTERR_D(x...) { PRINT_LINE; fprintf(stderr, x); fprintf(stderr, "\n"); fflush(stderr); }
-#define PERROR(x) { PRINT_LINE; perror(x); fflush(stderr); }
-#define DPERROR(x) PERROR(x)
-#else
-#define PRINT_LINE /**/
-#define PRINTERR_D(x...) /**/
-#define PERROR(x) perror(x);
-#define DPERROR(x) /**/
-#endif
-#define CHECKPOINT PRINTERR_D("*** CHECKPOINT REACHED ***")
-#define SPOTVAR_LLX(x) PRINTERR_D(#x " = %llx", x)
-#define SPOTVAR_LLU(x) PRINTERR_D(#x " = %llu", x)
-#define SPOTVAR_LL(x) PRINTERR_D(#x " = %lli", x)
-#define SPOTVAR_LU(x) PRINTERR_D(#x " = %lu", x)
-#define SPOTVAR_D(x) PRINTERR_D(#x " = %lf", x)
-#define SPOTVAR_X(x) PRINTERR_D(#x " = 0x%x", x)
-#define SPOTVAR_I(x) PRINTERR_D(#x " = %i", x)
-#define SPOTVAR_P(x) PRINTERR_D(#x " = %p", x)
-#define SPOTVAR_S(x) PRINTERR_D(#x " = \"%s\"", x)
-#define SPOTVAR_C(x) PRINTERR_D(#x " = \'%c\'", x)
-#define PRINTERR(x...) { PRINT_LINE; fprintf(stderr, x); fprintf(stderr, "\n"); fflush(stderr); }
-#define LOG(x...) { PRINT_LINE; fprintf(stderr, "LOG: " x); fprintf(stderr, "\n"); }
-
 #endif