Move platform-specific terminal code out of headers

3 files changed, 35 insertions, 26 deletions

diff --git a/src/control.c b/src/control.c
index 5c60c16..9c48713 100644
--- a/src/control.c
+++ b/src/control.c
@@ -14,6 +14,8 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#define _POSIX_C_SOURCE 200809L
+
 #include "jalv_internal.h"
 
 #include "lilv/lilv.h"
diff --git a/src/jalv_internal.h b/src/jalv_internal.h
index 33e214f..36b63ed 100644
--- a/src/jalv_internal.h
+++ b/src/jalv_internal.h
@@ -17,8 +17,6 @@
 #ifndef JALV_INTERNAL_H
 #define JALV_INTERNAL_H
 
-#define _POSIX_C_SOURCE 200809L
-
 #include "jalv_config.h"
 #include "lv2_evbuf.h"
 #include "symap.h"
@@ -45,10 +43,6 @@
 #include "lv2/urid/urid.h"
 #include "lv2/worker/worker.h"
 
-#ifdef HAVE_ISATTY
-#  include <unistd.h>
-#endif
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -531,27 +525,11 @@ JALV_LOG_FUNC(3, 0)
 int
 jalv_vprintf(LV2_Log_Handle handle, LV2_URID type, const char* fmt, va_list ap);
 
-static inline bool
-jalv_ansi_start(FILE* stream, int color)
-{
-#if defined(HAVE_ISATTY) && defined(HAVE_FILENO)
-  if (isatty(fileno(stream))) {
-    return fprintf(stream, "\033[0;%dm", color);
-  }
-#endif
-  return 0;
-}
+bool
+jalv_ansi_start(FILE* stream, int color);
 
-static inline void
-jalv_ansi_reset(FILE* stream)
-{
-#ifdef HAVE_ISATTY
-  if (isatty(fileno(stream))) {
-    fprintf(stream, "\033[0m");
-    fflush(stream);
-  }
-#endif
-}
+void
+jalv_ansi_reset(FILE* stream);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/src/log.c b/src/log.c
index 3d1bfec..4518802 100644
--- a/src/log.c
+++ b/src/log.c
@@ -14,11 +14,18 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#define _POSIX_C_SOURCE 200809L
+
+#include "jalv_config.h"
 #include "jalv_internal.h"
 
 #include "lv2/log/log.h"
 #include "lv2/urid/urid.h"
 
+#ifdef HAVE_ISATTY
+#  include <unistd.h>
+#endif
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -60,3 +67,25 @@ jalv_vprintf(LV2_Log_Handle handle, LV2_URID type, const char* fmt, va_list ap)
 
   return st;
 }
+
+bool
+jalv_ansi_start(FILE* stream, int color)
+{
+#if defined(HAVE_ISATTY) && defined(HAVE_FILENO)
+  if (isatty(fileno(stream))) {
+    return fprintf(stream, "\033[0;%dm", color);
+  }
+#endif
+  return 0;
+}
+
+void
+jalv_ansi_reset(FILE* stream)
+{
+#ifdef HAVE_ISATTY
+  if (isatty(fileno(stream))) {
+    fprintf(stream, "\033[0m");
+    fflush(stream);
+  }
+#endif
+}