From: Willy Tarreau <w@1wt.eu>
Date: Tue, 15 Jul 2014 16:05:58 +0000 (+0200)
Subject: BUILD: fix dependencies between config and compat.h
X-Git-Tag: v1.6-dev1~358
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d805fd;p=thirdparty%2Fhaproxy.git

BUILD: fix dependencies between config and compat.h

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.
---

diff --git a/include/common/compat.h b/include/common/compat.h
index 48ea1f710b..ecbc3b1164 100644
--- a/include/common/compat.h
+++ b/include/common/compat.h
@@ -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))
diff --git a/include/common/config.h b/include/common/config.h
index 5833cfcdb8..27b8f14e9a 100644
--- a/include/common/config.h
+++ b/include/common/config.h
@@ -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
diff --git a/include/types/global.h b/include/types/global.h
index 14a6bf2e19..85203fad04 100644
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -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>