CLEANUP: include: remove excessive includes of common/standard.h

Some of them were simply removed as unused (possibly some leftovers
from an older cleanup session), some were turned to haproxy/bitops.h
and a few had to be added (hlua.c and stick-table.h need standard.h
for parse_time_err; htx.h requires chunk.h but used to get it through
standard.h).

diff --git a/include/common/fcgi.h b/include/common/fcgi.h
index b822a2c8409d10c11bf09599e22ac8dde4f0c295..43174f0959396362ad7430b233bfe1d52efcaaf2 100644 (file)
--- a/include/common/fcgi.h
+++ b/include/common/fcgi.h
@@ -24,7 +24,6 @@
 
 #include <stdio.h>
 #include <haproxy/api.h>
-#include <common/standard.h>
 #include <haproxy/buf-t.h>
 #include <import/ist.h>
 

diff --git a/include/common/h1.h b/include/common/h1.h
index f75ee11fbd1d28c2f029c8af346efd2e7be9e654..1295b142005682a751f2ac0ea59855ee1588d152 100644 (file)
--- a/include/common/h1.h
+++ b/include/common/h1.h
@@ -23,11 +23,11 @@
 #define _COMMON_H1_H
 
 #include <haproxy/api.h>
+#include <haproxy/intops.h>
 #include <common/buffer.h>
 #include <common/http.h>
 #include <common/http-hdr.h>
 #include <import/ist.h>
-#include <common/standard.h>
 
 
 /* Possible states while parsing HTTP/1 messages (request|response) */

diff --git a/include/common/htx.h b/include/common/htx.h
index 197ffb6e684e328f597fe0f278d1a75ecb804ad7..e73b69939a73dfe2c0e18206269482e8f1a63fac 100644 (file)
--- a/include/common/htx.h
+++ b/include/common/htx.h
@@ -26,9 +26,9 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <import/ist.h>
+#include <common/chunk.h>
 #include <common/http.h>
 #include <common/http-hdr.h>
-#include <common/standard.h>
 
 /*
  * The internal representation of an HTTP message, called HTX, is a structure

diff --git a/include/common/net_helper.h b/include/common/net_helper.h
index 8fdf12088f51dc9c236c4802d3f29ea33879297e..5911ca4da81c43adf9e7f603e9157a2ff69d1023 100644 (file)
--- a/include/common/net_helper.h
+++ b/include/common/net_helper.h
@@ -28,7 +28,7 @@
 #define _COMMON_NET_HELPER_H
 
 #include <haproxy/api.h>
-#include <common/standard.h>
+#include <haproxy/intops.h>
 #include <arpa/inet.h>
 
 /* Functions to read/write various integers that may be unaligned */

diff --git a/include/common/ticks.h b/include/common/ticks.h
index 807b323dfed7b6991d03806fa6a2b18f66c4a20b..7fd0bbab26c953629de915f71121c23695783001 100644 (file)
--- a/include/common/ticks.h
+++ b/include/common/ticks.h
@@ -53,7 +53,6 @@
 #define _COMMON_TICKS_H
 
 #include <haproxy/api.h>
-#include <common/standard.h>
 
 #define TICK_ETERNITY   0
 

diff --git a/include/proto/freq_ctr.h b/include/proto/freq_ctr.h
index 896a4694e4f33ad5fe327ff698a1c40ea5da09cd..332d720b3fddd1990e1310feab932d2c6751f132 100644 (file)
--- a/include/proto/freq_ctr.h
+++ b/include/proto/freq_ctr.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/atomic.h>
 #include <haproxy/api.h>
-#include <common/standard.h>
+#include <haproxy/intops.h>
 #include <haproxy/time.h>
 #include <types/freq_ctr.h>
 

diff --git a/include/proto/pattern.h b/include/proto/pattern.h
index 2d51d95ad35d51ca8e4e510b37ba81f5ce7c281f..73c48cc3b1966291c6d89c5b507ee769838505aa 100644 (file)
--- a/include/proto/pattern.h
+++ b/include/proto/pattern.h
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/standard.h>
 #include <types/pattern.h>
 
 /* pattern management function arrays */

diff --git a/include/proto/signal.h b/include/proto/signal.h
index b2fd2c891ccc41346d916ba450cee09353e6d738..aaa23f6333e07d312edb4e8c4e209f3551873f90 100644 (file)
--- a/include/proto/signal.h
+++ b/include/proto/signal.h
@@ -12,7 +12,6 @@
  */
 
 #include <signal.h>
-#include <common/standard.h>
 #include <haproxy/thread.h>
 
 #include <types/signal.h>

diff --git a/include/proto/spoe.h b/include/proto/spoe.h
index b3f7b4f8bb73c7098f71c7f61e9c0c3c9f5433b2..584b38af86b075e31128e2463fa4d8946dd17811 100644 (file)
--- a/include/proto/spoe.h
+++ b/include/proto/spoe.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_SPOE_H
 #define _PROTO_SPOE_H
 
-#include <common/standard.h>
+#include <haproxy/intops.h>
 
 #include <types/spoe.h>
 

diff --git a/include/proto/stats.h b/include/proto/stats.h
index 5342e12a055b494fe0e869b8bba0c48d8f96ee59..01c08ba13617be4b204a8c9ff7f4e7a614756cbf 100644 (file)
--- a/include/proto/stats.h
+++ b/include/proto/stats.h
@@ -23,6 +23,7 @@
 #ifndef _PROTO_STATS_H
 #define _PROTO_STATS_H
 
+#include <common/standard.h>
 #include <haproxy/api.h>
 #include <types/applet.h>
 #include <types/stream_interface.h>

diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index dcc29546b7383fcfef962404c0acc2af17bc4e57..eab3800b82a40d4237a3098c2723b1bccbe4efc2 100644 (file)
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -24,6 +24,7 @@
 #define _PROTO_STICK_TABLE_H
 
 #include <haproxy/errors.h>
+#include <common/standard.h>
 #include <common/ticks.h>
 #include <haproxy/time.h>
 #include <types/stick_table.h>

diff --git a/include/proto/task.h b/include/proto/task.h
index 05b048b5abfcc6b7c6148f71472896955fb6da37..d5cded3cfa0916d4ebbc40de332e816b371aee9d 100644 (file)
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -27,8 +27,8 @@
 
 #include <haproxy/api.h>
 #include <common/memory.h>
+#include <haproxy/intops.h>
 #include <haproxy/list.h>
-#include <common/standard.h>
 #include <common/ticks.h>
 #include <haproxy/thread.h>
 

diff --git a/include/proto/trace.h b/include/proto/trace.h
index 144794057355314dd94c1ab880656609fd1e7fd8..7a2b5e7e1034b30b7d1e5ca887909a762ed9bce4 100644 (file)
--- a/include/proto/trace.h
+++ b/include/proto/trace.h
@@ -24,6 +24,7 @@
 
 #include <haproxy/api.h>
 #include <common/buffer.h>
+#include <common/standard.h>
 #include <import/ist.h>
 #include <haproxy/list.h>
 #include <types/log.h>

diff --git a/include/types/checks.h b/include/types/checks.h
index 3ea4a06384ecdcdced5d2c98035f44bc5be53bfb..243a1ef0303e7333bbd0558d586298ecb1489710 100644 (file)
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -16,7 +16,6 @@
 #include <haproxy/api-t.h>
 #include <import/ebpttree.h>
 
-#include <common/standard.h>
 #include <import/ist.h>
 #include <haproxy/list-t.h>
 #include <common/regex.h>

diff --git a/include/types/signal.h b/include/types/signal.h
index 838aefd655b1a3003b75d88e175c48a470c78160..70cce77e29f952a48020a2d2f1b6cd5ea9b1a70b 100644 (file)
--- a/include/types/signal.h
+++ b/include/types/signal.h
@@ -18,7 +18,6 @@
 #include <signal.h>
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
-#include <common/standard.h>
 
 /* flags for -> flags */
 #define SIG_F_ONE_SHOOT         0x0001  /* unregister handler before calling it */

diff --git a/src/hlua.c b/src/hlua.c
index 84fcf8b035b775ab2d6f6bf4e0d12f0b026dd2b6..06c45b6c156212a7085ec8c0aa562bc14f7e4b0e 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -28,6 +28,7 @@
 #include <haproxy/thread.h>
 #include <common/xref.h>
 #include <common/h1.h>
+#include <common/standard.h>
 
 #include <types/cli.h>
 #include <types/hlua.h>