REORG: include: move dict.h to hparoxy/dict{,-t}.h
This was entirely free-standing. haproxy/api-t.h was added for size_t.
diff --git a/include/haproxy/dict-t.h b/include/haproxy/dict-t.h
new file mode 100644
index 0000000..b026d30
--- /dev/null
+++ b/include/haproxy/dict-t.h
@@ -0,0 +1,46 @@
+/*
+ * include/haproxy/dict-t.h
+ * Dictionaries - types definitions
+ *
+ * Copyright 2019 Frédéric Lécaille <flecaille@haproxy.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef _HAPROXY_DICT_T_H
+#define _HAPROXY_DICT_T_H
+
+#include <import/ebpttree.h>
+#include <haproxy/api-t.h>
+#include <haproxy/thread.h>
+
+struct dict_entry {
+ struct ebpt_node value;
+ unsigned int refcount;
+ size_t len;
+};
+
+struct dict {
+ const char *name;
+ struct eb_root values;
+ __decl_thread(HA_RWLOCK_T rwlock);
+};
+
+#endif /* _HAPROXY_DICT_T_H */
diff --git a/include/haproxy/dict.h b/include/haproxy/dict.h
new file mode 100644
index 0000000..59e8135
--- /dev/null
+++ b/include/haproxy/dict.h
@@ -0,0 +1,35 @@
+/*
+ * include/haproxy/dict.h
+ * Dictionaries - functions prototypes
+ *
+ * Copyright 2019 Frédéric Lécaille <flecaille@haproxy.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef _HAPROXY_DICT_H
+#define _HAPROXY_DICT_H
+
+#include <haproxy/dict-t.h>
+
+struct dict *new_dict(const char *name);
+struct dict_entry *dict_insert(struct dict *d, char *str);
+
+#endif /* _HAPROXY_DICT_H */
diff --git a/include/proto/dict.h b/include/proto/dict.h
deleted file mode 100644
index 26f48de..0000000
--- a/include/proto/dict.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _PROTO_DICT_H
-#define _PROTO_DICT_H
-
-#include <types/dict.h>
-
-struct dict *new_dict(const char *name);
-struct dict_entry *dict_insert(struct dict *d, char *str);
-
-#endif /* _PROTO_DICT_H */
diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 7f35cfa..ebc4d67 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -23,12 +23,12 @@
#ifndef _PROTO_STICK_TABLE_H
#define _PROTO_STICK_TABLE_H
+#include <haproxy/dict-t.h>
#include <haproxy/errors.h>
#include <haproxy/tools.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
#include <types/stick_table.h>
-#include <types/dict.h>
extern struct stktable *stktables_list;
diff --git a/include/types/dict.h b/include/types/dict.h
deleted file mode 100644
index def6355..0000000
--- a/include/types/dict.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _TYPES_DICT_H
-#define _TYPES_DICT_H
-
-#include <haproxy/thread.h>
-#include <import/ebpttree.h>
-
-struct dict_entry {
- struct ebpt_node value;
- unsigned int refcount;
- size_t len;
-};
-
-struct dict {
- const char *name;
- struct eb_root values;
- __decl_thread(HA_RWLOCK_T rwlock);
-};
-
-#endif /* _TYPES_DICT_H */
diff --git a/include/types/peers.h b/include/types/peers.h
index 8961d7e..33d40ec 100644
--- a/include/types/peers.h
+++ b/include/types/peers.h
@@ -27,11 +27,11 @@
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <haproxy/dict-t.h>
#include <haproxy/api-t.h>
#include <haproxy/list-t.h>
#include <import/eb32tree.h>
-#include <types/dict.h>
struct shared_table {
struct stktable *table; /* stick table to sync */
diff --git a/include/types/stick_table.h b/include/types/stick_table.h
index ccd1dcb..e345048 100644
--- a/include/types/stick_table.h
+++ b/include/types/stick_table.h
@@ -29,8 +29,8 @@
#include <import/ebtree.h>
#include <import/ebmbtree.h>
#include <import/eb32tree.h>
+#include <haproxy/dict-t.h>
#include <haproxy/pool-t.h>
-#include <types/dict.h>
#include <haproxy/freq_ctr-t.h>
#include <types/peers.h>
#include <types/sample.h>