From b6225dc7cadb63161150283e99b902ea8a89dceb Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 6 Feb 2024 06:03:44 -0500
Subject: Consolidate header includes to omc.h

---
 include/artifactory.h | 2 --
 include/deliverable.h | 6 +-----
 include/omc.h         | 4 ++++
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/artifactory.h b/include/artifactory.h
index 1904c8e..847e601 100644
--- a/include/artifactory.h
+++ b/include/artifactory.h
@@ -3,9 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "copy.h"
 #include "omc.h"
-#include "system.h"
 
 struct JFRT_Auth {
     bool insecure_tls;
diff --git a/include/deliverable.h b/include/deliverable.h
index e699703..75b5798 100644
--- a/include/deliverable.h
+++ b/include/deliverable.h
@@ -7,11 +7,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <sys/utsname.h>
-#include "str.h"
-#include "ini.h"
-#include "environment.h"
-#include "conda.h"
-#include "artifactory.h"
+#include "omc.h"
 
 #define DELIVERY_PLATFORM_MAX 4
 #define DELIVERY_PLATFORM_MAXLEN 65
diff --git a/include/omc.h b/include/omc.h
index 792dd90..36ab676 100644
--- a/include/omc.h
+++ b/include/omc.h
@@ -7,18 +7,22 @@
 #include <limits.h>
 #include <unistd.h>
 #include <time.h>
+#include <sys/statvfs.h>
 
 #define SYSERROR stderr, "%s:%s:%d: %s\n", path_basename(__FILE__), __FUNCTION__, __LINE__, strerror(errno)
 #define OMC_BUFSIZ 8192
 #define OMC_NAME_MAX 255
 #define OMC_DIRSTACK_MAX 1024
+#define HTTP_ERROR(X) X >= 400
 
 #include "config.h"
 #include "template.h"
 #include "utils.h"
+#include "copy.h"
 #include "ini.h"
 #include "conda.h"
 #include "environment.h"
+#include "artifactory.h"
 #include "deliverable.h"
 #include "str.h"
 #include "strlist.h"
-- 
cgit