]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: fix dependencies between config and compat.h
authorWilly Tarreau <w@1wt.eu>
Tue, 15 Jul 2014 16:05:58 +0000 (18:05 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 15 Jul 2014 17:09:36 +0000 (19:09 +0200)
compat.h only depends on the system, and config needs compat, not the
opposite. global.h was fixed to explicitly include standard.h for LONGBITS.

include/common/compat.h
include/common/config.h
include/types/global.h

index 48ea1f710be2d67950a783e0cf7dadacda3ccfe8..ecbc3b1164153273b6e808c2b057c796c74aa8b7 100644 (file)
@@ -27,8 +27,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include <common/config.h>
-#include <common/standard.h>
 
 #ifndef BITS_PER_INT
 #define BITS_PER_INT    (8*sizeof(int))
index 5833cfcdb869e38840881b38c5bef56457e08bde..27b8f14e9afde5045951bd8aa7d8d3b9bb74b3d3 100644 (file)
@@ -23,6 +23,7 @@
 #define _COMMON_CONFIG_H
 
 #include <common/compiler.h>
+#include <common/compat.h>
 #include <common/defaults.h>
 
 /* this reduces the number of calls to select() by choosing appropriate
index 14a6bf2e196d91eb5e4601ba01c933e0356e2ccf..85203fad046b5fc7675bf7e2982f494f114b42c0 100644 (file)
@@ -25,6 +25,7 @@
 #include <netinet/in.h>
 
 #include <common/config.h>
+#include <common/standard.h>
 #include <types/freq_ctr.h>
 #include <types/listener.h>
 #include <types/proxy.h>