aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/artifactory.h2
-rw-r--r--include/deliverable.h6
-rw-r--r--include/omc.h4
-rw-r--r--src/artifactory.c2
-rw-r--r--src/deliverable.c6
5 files changed, 6 insertions, 14 deletions
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"
diff --git a/src/artifactory.c b/src/artifactory.c
index e883d26..c44c95f 100644
--- a/src/artifactory.c
+++ b/src/artifactory.c
@@ -1,4 +1,4 @@
-#include "artifactory.h"
+#include "omc.h"
extern struct OMC_GLOBAL globals;
diff --git a/src/deliverable.c b/src/deliverable.c
index e7d47f5..9b43772 100644
--- a/src/deliverable.c
+++ b/src/deliverable.c
@@ -1,12 +1,6 @@
#define _GNU_SOURCE
-#include <sys/statvfs.h>
#include "omc.h"
-#include "deliverable.h"
-#include "str.h"
-#include "strlist.h"
-#include "wheel.h"
-#include "copy.h"
extern struct OMC_GLOBAL globals;