Fix include deadlock over CLOCK_TAI through milkDebugTools.h

milk-org · Sep 20, 2023 · 7a13fa2 · 7a13fa2
1 parent c74ab17
commit 7a13fa2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/CommandLineInterface/milkDebugTools.h b/src/CommandLineInterface/milkDebugTools.h
@@ -17,6 +17,7 @@ typedef int errno_t;
 #endif
 
 #include "CommandLineInterface/CLIcore/CLIcore_signals.h"
+#include "CommandLineInterface/timeutils.h"
 
 // error mode
 // defines function behavior on error
@@ -227,7 +228,7 @@ typedef int errno_t;
             abort();                                                           \
         }                                                                      \
         data.testpoint.line = __LINE__;                                        \
-        clock_gettime(CLOCK_MILK, &data.testpoint.time);                   \
+        clock_gettime(CLOCK_MILK, &data.testpoint.time);                       \
     } while (0)
 
 /**

diff --git a/src/CommandLineInterface/timeutils.h b/src/CommandLineInterface/timeutils.h
@@ -5,17 +5,19 @@
 #ifndef _CLICORE_TIMEUTILS_H
 #define _CLICORE_TIMEUTILS_H
 
-#include "CommandLineInterface/CLIcore.h" // errno_t
+//#include <errno.h> // errno_t
 
 // holds "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ" + \0 + 1 char extra
 #define TIMESTRINGLEN 32
 
-
 // handles leap seconds better than CLOCK_REALTIME
 #define CLOCK_MILK CLOCK_TAI
 #define TZ_MILK_STR "HST" // Name of timezone to use in FITS headers.
 #define TZ_MILK_UTC_OFF -36000.0 // Offset east of UTC in seconds for TZ_MILK_STR
 
+// Don't move above #definitions, this an unresolved circular import of hell
+#include "CommandLineInterface/CLIcore.h" // errno_t
+
 errno_t milk_clock_gettime(struct timespec *tnow_p);
 
 errno_t mkUTtimestring_nanosec(char *timestring, struct timespec tnow);