Simplify amalgamation script

2025-07-21 02:21:33 +02:00
parent c3bfb86707
commit acf4746611
20 changed files with 542 additions and 611 deletions
@@ -1,20 +1,8 @@
-#include <poll.h>
 #include <assert.h> // TODO: organize these includes
-#include "socket.h"
-#ifdef HTTPS_ENABLED
-#include <openssl/pem.h>
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-#include <openssl/rsa.h>
-#include <openssl/evp.h>
-#include <openssl/bn.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -24,9 +12,23 @@
 #endif

 #ifdef __linux__
+#include <poll.h>
 #include <netdb.h>
 #endif

+#ifdef HTTPS_ENABLED
+#include <openssl/pem.h>
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#endif
+
+#ifndef HTTP_AMALGAMATION
+#include "socket.h"
+#endif
+
 void socket_global_init(void)
 {
 #ifdef HTTPS_ENABLED