[CLEANUP] renamed include/haproxy to include/common

diff --git a/include/haproxy/appsession.h b/include/common/appsession.h
similarity index 86%
rename from include/haproxy/appsession.h
rename to include/common/appsession.h
index 94a7e65cc01a9d41043984b374b1c5e312249575..2c39e4663c8fd9bec72069171b5582191f1b63a1 100644 (file)
--- a/include/haproxy/appsession.h
+++ b/include/common/appsession.h
@@ -1,14 +1,14 @@
-#ifndef _HAPROXY_APPSESS_H
-#define _HAPROXY_APPSESS_H
+#ifndef _COMMON_APPSESS_H
+#define _COMMON_APPSESS_H
 
 #define TBLSIZ 10
 #define TBLCHKINT 5000 /* The time between two calls of appsession_refresh in ms */
 
 #include <sys/time.h>
 
-#include <haproxy/chtbl.h>
-#include <haproxy/hashpjw.h>
-#include <haproxy/list.h>
+#include <common/chtbl.h>
+#include <common/hashpjw.h>
+#include <common/list.h>
 
 #include <types/task.h>
 
@@ -48,7 +48,7 @@ int appsession_task_init(void);
 int appsession_init(void);
 void appsession_cleanup(void);
 
-#endif /* _HAPROXY_APPSESS_H */
+#endif /* _COMMON_APPSESS_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/base64.h b/include/common/base64.h
similarity index 80%
rename from include/haproxy/base64.h
rename to include/common/base64.h
index d22d903a4f5eb8f28cd1adb3ded84531d75e704d..3948962d66ba08122842168c6a8bfd4cf61da30a 100644 (file)
--- a/include/haproxy/base64.h
+++ b/include/common/base64.h
@@ -1,5 +1,5 @@
 /*
- * include/haproxy/base64.h
+ * include/common/base64.h
  * Ascii to Base64 conversion as described in RFC1421.
  *
  * Copyright 2006 Willy Tarreau <w@1wt.eu>
@@ -11,10 +11,10 @@
  *
  */
 
-#ifndef _HAPROXY_BASE64_H
-#define _HAPROXY_BASE64_H
+#ifndef _COMMON_BASE64_H
+#define _COMMON_BASE64_H
 
 int a2base64(char *in, int ilen, char *out, int olen);
 extern const char base64tab[];
 
-#endif /* _HAPROXY_BASE64_H */
+#endif /* _COMMON_BASE64_H */

diff --git a/include/haproxy/cfgparse.h b/include/common/cfgparse.h
similarity index 90%
rename from include/haproxy/cfgparse.h
rename to include/common/cfgparse.h
index f945d9c20619f302273a7f5034b548218bb675b9..35302b3b72b4821c00ba2f87fb03a5c1b52506b5 100644 (file)
--- a/include/haproxy/cfgparse.h
+++ b/include/common/cfgparse.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/cfgparse.h
+  include/common/cfgparse.h
   Configuration parsing functions.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_CFGPARSE_H
-#define _HAPROXY_CFGPARSE_H
+#ifndef _COMMON_CFGPARSE_H
+#define _COMMON_CFGPARSE_H
 
 /* configuration sections */
 #define CFG_NONE       0
@@ -35,7 +35,7 @@ int cfg_parse_listen(char *file, int linenum, char **args);
 int readcfgfile(char *file);
 
 
-#endif /* _HAPROXY_CFGPARSE_H */
+#endif /* _COMMON_CFGPARSE_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/chtbl.h b/include/common/chtbl.h
similarity index 96%
rename from include/haproxy/chtbl.h
rename to include/common/chtbl.h
index fe4de70e4ab0397f95daa1cc8d0e6f28716072af..38b495fb87d852b973f57e39455bd0fc88cf29a9 100644 (file)
--- a/include/haproxy/chtbl.h
+++ b/include/common/chtbl.h
@@ -15,8 +15,8 @@
 *                                                                            *
 *****************************************************************************/
 
-#ifndef _HAPROXY_CHTBL_H
-#define _HAPROXY_CHTBL_H
+#ifndef _COMMON_CHTBL_H
+#define _COMMON_CHTBL_H
 
 #include <stdlib.h>
 
@@ -59,5 +59,5 @@ int chtbl_lookup(const CHTbl *htbl, void **data);
 
 #define chtbl_size(htbl) ((htbl)->size)
 
-#endif /* _HAPROXY_CHTBL_H */
+#endif /* _COMMON_CHTBL_H */
 

diff --git a/include/haproxy/compat.h b/include/common/compat.h
similarity index 92%
rename from include/haproxy/compat.h
rename to include/common/compat.h
index bf4c843c77e02191062d56abd5e709a7a31463dd..a605da1ec4d9a6c420834c0f186e07fbc3fdc961 100644 (file)
--- a/include/haproxy/compat.h
+++ b/include/common/compat.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/compat.h
+  include/common/compat.h
   Operating system compatibility interface.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_COMPAT_H
-#define _HAPROXY_COMPAT_H
+#ifndef _COMMON_COMPAT_H
+#define _COMMON_COMPAT_H
 
 /* This is needed on Linux for Netfilter includes */
 #include <sys/socket.h>
@@ -52,7 +52,7 @@
 #include <strings.h>
 #endif
 
-#endif /* _HAPROXY_COMPAT_H */
+#endif /* _COMMON_COMPAT_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/config.h b/include/common/config.h
similarity index 88%
rename from include/haproxy/config.h
rename to include/common/config.h
index 968e3c1514dc9cf6c1dd30efbd9aa0da2b4f5009..f9145c50a434ed6cf680d2835b60e0010c477ff8 100644 (file)
--- a/include/haproxy/config.h
+++ b/include/common/config.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/config.h
+  include/common/config.h
   This files contains most of the user-configurable settings.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,10 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_CONFIG_H
-#define _HAPROXY_CONFIG_H
+#ifndef _COMMON_CONFIG_H
+#define _COMMON_CONFIG_H
 
-#include <haproxy/defaults.h>
+#include <common/defaults.h>
 
 /* this reduces the number of calls to select() by choosing appropriate
  * sheduler precision in milliseconds. It should be near the minimum
@@ -31,4 +31,4 @@
  */
 #define SCHEDULER_RESOLUTION    9
 
-#endif /* _HAPROXY_CONFIG_H */
+#endif /* _COMMON_CONFIG_H */

diff --git a/include/haproxy/defaults.h b/include/common/defaults.h
similarity index 96%
rename from include/haproxy/defaults.h
rename to include/common/defaults.h
index f01dc67f6bf8f81318c9f973723e395c9bca7f42..449fc5f17644bfedfeac2f4bcfd4a6c5ff8df5a5 100644 (file)
--- a/include/haproxy/defaults.h
+++ b/include/common/defaults.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/defaults.h
+  include/common/defaults.h
   Miscellaneous default values.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_DEFAULTS_H
-#define _HAPROXY_DEFAULTS_H
+#ifndef _COMMON_DEFAULTS_H
+#define _COMMON_DEFAULTS_H
 
 
 /* CONFIG_HAP_MEM_OPTIM
@@ -91,4 +91,4 @@
 #define DEFAULT_MAXCONN SYSTEM_MAXCONN
 #endif
 
-#endif /* _HAPROXY_DEFAULTS_H */
+#endif /* _COMMON_DEFAULTS_H */

diff --git a/include/haproxy/epoll.h b/include/common/epoll.h
similarity index 96%
rename from include/haproxy/epoll.h
rename to include/common/epoll.h
index d1bd112f1d90c288bf44d83aeb2c290ab3c1ef03..865a3e1298d3f06c4979ce2f9f5ab728c682719e 100644 (file)
--- a/include/haproxy/epoll.h
+++ b/include/common/epoll.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/epoll.h
+  include/common/epoll.h
   epoll definitions for older libc.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -26,8 +26,8 @@
  * just a basic definition.
  */
 
-#ifndef _HAPROXY_EPOLL_H
-#define _HAPROXY_EPOLL_H
+#ifndef _COMMON_EPOLL_H
+#define _COMMON_EPOLL_H
 
 #include <linux/unistd.h>
 #include <stdint.h>
@@ -92,7 +92,7 @@ extern int epoll_create(int size);
 extern int epoll_ctl(int epfd, int op, int fd, struct epoll_event * event);
 extern int epoll_wait(int epfd, struct epoll_event * events, int maxevents, int timeout);
 
-#endif /* _HAPROXY_EPOLL_H */
+#endif /* _COMMON_EPOLL_H */
 
 
 /*

diff --git a/include/haproxy/hashpjw.h b/include/common/hashpjw.h
similarity index 94%
rename from include/haproxy/hashpjw.h
rename to include/common/hashpjw.h
index 2788395db11aa15a4aa5f708fd924a943702d4de..99a3ad7bc9886983cc26b900b59fd29a288aff7b 100644 (file)
--- a/include/haproxy/hashpjw.h
+++ b/include/common/hashpjw.h
@@ -16,8 +16,8 @@
 *                                                                            *
 *****************************************************************************/
 
-#ifndef _HAPROXY_HASHPJW_H
-#define _HAPROXY_HASHPJW_H
+#ifndef _COMMON_HASHPJW_H
+#define _COMMON_HASHPJW_H
 
 /*****************************************************************************
 *                                                                            *
@@ -35,4 +35,4 @@
 
 int hashpjw(const void *key);
 
-#endif /* _HAPROXY_HASHPJW_H */
+#endif /* _COMMON_HASHPJW_H */

diff --git a/include/haproxy/list.h b/include/common/list.h
similarity index 97%
rename from include/haproxy/list.h
rename to include/common/list.h
index 16895734c7acba7a4b2f2410ca1c2e2d4fdc9d67..4537d8d986340a3d4a161beda0c9ee9dbfcba63e 100644 (file)
--- a/include/haproxy/list.h
+++ b/include/common/list.h
@@ -15,8 +15,8 @@
 *                                                                            *
 *****************************************************************************/
 
-#ifndef _HAPROXY_LIST_H
-#define _HAPROXY_LIST_H
+#ifndef _COMMON_LIST_H
+#define _COMMON_LIST_H
 
 #include <stdlib.h>
 
@@ -74,7 +74,7 @@ int list_rem_next(List *list, ListElmt *element, void **data);
 
 #define list_next(element) ((element)->next)
 
-#endif /* _HAPROXY_LIST_H */
+#endif /* _COMMON_LIST_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/memory.h b/include/common/memory.h
similarity index 96%
rename from include/haproxy/memory.h
rename to include/common/memory.h
index 3f269d2c8b40643679be905c7da92043b470af65..820c1d98e18bbb66f2889771e53e7ccb5af7c16f 100644 (file)
--- a/include/haproxy/memory.h
+++ b/include/common/memory.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/memory.h
+  include/common/memory.h
   Memory management definitions..
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,12 +19,12 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_MEMORY_H
-#define _HAPROXY_MEMORY_H
+#ifndef _COMMON_MEMORY_H
+#define _COMMON_MEMORY_H
 
 #include <stdlib.h>
 
-#include <haproxy/config.h>
+#include <common/config.h>
 
 #define sizeof_requri   REQURI_LEN
 #define sizeof_capture  CAPTURE_LEN
@@ -112,7 +112,7 @@ static inline void pool_destroy(void **pool)
        }
 }
 
-#endif /* _HAPROXY_MEMORY_H */
+#endif /* _COMMON_MEMORY_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/mini-clist.h b/include/common/mini-clist.h
similarity index 97%
rename from include/haproxy/mini-clist.h
rename to include/common/mini-clist.h
index bf9bbe93c910eadf64dc3ae7245b248157e92844..47b004d7ae023c5b02fc643fb758867f8a22bc9e 100644 (file)
--- a/include/haproxy/mini-clist.h
+++ b/include/common/mini-clist.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef _HAPROXY_MINI_CLIST_H
-#define _HAPROXY_MINI_CLIST_H
+#ifndef _COMMON_MINI_CLIST_H
+#define _COMMON_MINI_CLIST_H
 
 /* these are circular or bidirectionnal lists only. Each list pointer points to
  * another list pointer in a structure, and not the structure itself. The
@@ -91,4 +91,4 @@ struct list {
        for ( ; (iterator) != (end_item); (iterator) = (backup),   \
                backup = LIST_ELEM((iterator)->struct_member.n, struct_type, struct_member))
 
-#endif /* _HAPROXY_MINI_CLIST_H */
+#endif /* _COMMON_MINI_CLIST_H */

diff --git a/include/haproxy/regex.h b/include/common/regex.h
similarity index 92%
rename from include/haproxy/regex.h
rename to include/common/regex.h
index 03b4ca6905b99382e1d6ec70dfad551fb8cc34dd..d9510bfba7e4e41b20c710e6bc229e4fe9a397cc 100644 (file)
--- a/include/haproxy/regex.h
+++ b/include/common/regex.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/regex.h
+  include/common/regex.h
   This file defines everything related to regular expressions.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,10 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_REGEX_H
-#define _HAPROXY_REGEX_H
+#ifndef _COMMON_REGEX_H
+#define _COMMON_REGEX_H
 
-#include <haproxy/defaults.h>
+#include <common/defaults.h>
 
 #ifdef USE_PCRE
 #include <pcre.h>
@@ -51,7 +51,7 @@ int exp_replace(char *dst, char *src, char *str, regmatch_t *matches);
 char *check_replace_string(char *str);
 char *chain_regex(struct hdr_exp **head, regex_t *preg, int action, char *replace);
 
-#endif /* _HAPROXY_REGEX_H */
+#endif /* _COMMON_REGEX_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/standard.h b/include/common/standard.h
similarity index 95%
rename from include/haproxy/standard.h
rename to include/common/standard.h
index 05a2b0dbb3ac1c240ee0f2cceeb2be5f0b41208d..bde42e3169fc54174d73722f814b3553163acf29 100644 (file)
--- a/include/haproxy/standard.h
+++ b/include/common/standard.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/standard.h
+  include/common/standard.h
   This files contains some general purpose functions and macros.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,12 +19,12 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_STANDARD_H
-#define _HAPROXY_STANDARD_H
+#ifndef _COMMON_STANDARD_H
+#define _COMMON_STANDARD_H
 
 #include <netinet/in.h>
-#include <haproxy/defaults.h>
-#include <haproxy/compat.h>
+#include <common/defaults.h>
+#include <common/compat.h>
 
 
 /****** string-specific macros and functions ******/
@@ -89,4 +89,4 @@ char *encode_string(char *start, char *stop,
                    const char escape, const fd_set *map,
                    const char *string);
 
-#endif /* _HAPROXY_STANDARD_H */
+#endif /* _COMMON_STANDARD_H */

diff --git a/include/haproxy/template.h b/include/common/template.h
similarity index 88%
rename from include/haproxy/template.h
rename to include/common/template.h
index da2b9d5d18e567ee2343d0781db1db207e44bdf9..431274fac90438b93910557ddb5dfa6f32bf89f5 100644 (file)
--- a/include/haproxy/template.h
+++ b/include/common/template.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/template.h
+  include/common/template.h
   This file serves as a template for future include files.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,11 +19,11 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_TEMPLATE_H
-#define _HAPROXY_TEMPLATE_H
+#ifndef _COMMON_TEMPLATE_H
+#define _COMMON_TEMPLATE_H
 
 
-#endif /* _HAPROXY_TEMPLATE_H */
+#endif /* _COMMON_TEMPLATE_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/time.h b/include/common/time.h
similarity index 97%
rename from include/haproxy/time.h
rename to include/common/time.h
index dd3e70155d3a7f25dd26e540e75250f33277a20f..b25846662240f1749a8da88686be980c468d6ee2 100644 (file)
--- a/include/haproxy/time.h
+++ b/include/common/time.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/time.h
+  include/common/time.h
   Time calculation functions and macros.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_TIME_H
-#define _HAPROXY_TIME_H
+#ifndef _COMMON_TIME_H
+#define _COMMON_TIME_H
 
 #include <stdlib.h>
 #include <sys/time.h>
@@ -166,7 +166,7 @@ static inline struct timeval *tv_min(struct timeval *tvmin,
 }
 
 
-#endif /* _HAPROXY_TIME_H */
+#endif /* _COMMON_TIME_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/uri_auth.h b/include/common/uri_auth.h
similarity index 96%
rename from include/haproxy/uri_auth.h
rename to include/common/uri_auth.h
index 9eed7303b814228b5758cd3d70b41fcf550c580e..ddfa56ba6581b2305487b2cab81f6484c4a39600 100644 (file)
--- a/include/haproxy/uri_auth.h
+++ b/include/common/uri_auth.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef _HAPROXY_URI_AUTH_H
-#define _HAPROXY_URI_AUTH_H
+#ifndef _COMMON_URI_AUTH_H
+#define _COMMON_URI_AUTH_H
 /* here we find a very basic list of base64-encoded 'user:passwd' strings */
 struct user_auth {
        struct user_auth *next;         /* next entry, NULL if none */
@@ -65,4 +65,4 @@ struct uri_auth *stats_set_realm(struct uri_auth **root, char *realm);
 struct uri_auth *stats_add_auth(struct uri_auth **root, char *user);
 struct uri_auth *stats_add_scope(struct uri_auth **root, char *scope);
 
-#endif /* _HAPROXY_URI_AUTH_H */
+#endif /* _COMMON_URI_AUTH_H */

diff --git a/include/haproxy/version.h b/include/common/version.h
similarity index 90%
rename from include/haproxy/version.h
rename to include/common/version.h
index 16e0d54a8b0a4319e2706ff1d7a494bd7250dc72..c1ae43b233af9c374b7226c82c7a8bfcaf2c7422 100644 (file)
--- a/include/haproxy/version.h
+++ b/include/common/version.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/version.h
+  include/common/version.h
   This file serves as a template for future include files.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_VERSION_H
-#define _HAPROXY_VERSION_H
+#ifndef _COMMON_VERSION_H
+#define _COMMON_VERSION_H
 
 #ifdef  CONFIG_PRODUCT_NAME
 #define PRODUCT_NAME CONFIG_PRODUCT_NAME
@@ -36,4 +36,4 @@
 #define HAPROXY_DATE    "2006/06/26"
 #endif
 
-#endif /* _HAPROXY_VERSION_H */
+#endif /* _COMMON_VERSION_H */

diff --git a/include/proto/buffers.h b/include/proto/buffers.h
index 85557511bde986519a7912a17525dca49d19b99a..b332a4bcf6064321f533433ade6c1f1eff03f93a 100644 (file)
--- a/include/proto/buffers.h
+++ b/include/proto/buffers.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_BUFFERS_H
 #define _PROTO_BUFFERS_H
 
-#include <haproxy/defaults.h>
+#include <common/defaults.h>
 #include <types/buffers.h>
 
 /* returns 1 if the buffer is empty, 0 otherwise */

diff --git a/include/proto/queue.h b/include/proto/queue.h
index 9f135905c99feef2c7f4ba5bddd00be994bd240f..6909cbe0dfd9ba57d070b14fc708ae94da896742 100644 (file)
--- a/include/proto/queue.h
+++ b/include/proto/queue.h
@@ -22,8 +22,8 @@
 #ifndef _PROTO_QUEUE_H
 #define _PROTO_QUEUE_H
 
-#include <haproxy/memory.h>
-#include <haproxy/mini-clist.h>
+#include <common/memory.h>
+#include <common/mini-clist.h>
 
 #include <types/proxy.h>
 #include <types/queue.h>

diff --git a/include/proto/stream_sock.h b/include/proto/stream_sock.h
index bab3c53fd84faf0df2a8bb09f3f0524a6bd6b847..14d90cf819fbd3e0e4d6fb6c22454912da6d5072 100644 (file)
--- a/include/proto/stream_sock.h
+++ b/include/proto/stream_sock.h
@@ -26,8 +26,8 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <haproxy/defaults.h>
-#include <haproxy/config.h>
+#include <common/defaults.h>
+#include <common/config.h>
 
 
 /* FIXME: merge those ones together */

diff --git a/include/proto/task.h b/include/proto/task.h
index 8aba7950a98d553d082daf4d308a96372590386e..72fd1f18564e7c8bb949697c4a985bcf7f00e57a 100644 (file)
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -25,7 +25,7 @@
 
 #include <sys/time.h>
 #include <types/task.h>
-#include <haproxy/memory.h>
+#include <common/memory.h>
 
 
 /* puts the task <t> in run queue <q>, and returns <t> */

diff --git a/include/types/buffers.h b/include/types/buffers.h
index 2fcf59fa559b242885ec5839e93d9883ec7ad5f9..1bbea6905ee58042546155839c5b7f0deec8a948 100644 (file)
--- a/include/types/buffers.h
+++ b/include/types/buffers.h
@@ -22,8 +22,8 @@
 #ifndef _TYPES_BUFFERS_H
 #define _TYPES_BUFFERS_H
 
-#include <haproxy/defaults.h>
-#include <haproxy/memory.h>
+#include <common/defaults.h>
+#include <common/memory.h>
 
 /* describes a chunk of string */
 struct chunk {

diff --git a/include/types/fd.h b/include/types/fd.h
index 6e350e56ed8df4676553b17cd8d1eb8921e36e38..1b24be3f59fdad0b90bdd033f5384c4f946ca68f 100644 (file)
--- a/include/types/fd.h
+++ b/include/types/fd.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <haproxy/config.h>
+#include <common/config.h>
 #include <types/task.h>
 
 /* different possible states for the fd */

diff --git a/include/types/polling.h b/include/types/polling.h
index 3c2a231a5f0b423b633768546fffd94b07a6a663..cd9fe93a59a63c9de5ff8225f7de11056ae54d37 100644 (file)
--- a/include/types/polling.h
+++ b/include/types/polling.h
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <haproxy/config.h>
+#include <common/config.h>
 
 /* for POLL_* */
 #if defined(ENABLE_POLL)
@@ -39,7 +39,7 @@
 #if !defined(USE_MY_EPOLL)
 #include <sys/epoll.h>
 #else
-#include <haproxy/epoll.h>
+#include <common/epoll.h>
 #endif
 #endif
 

diff --git a/include/types/proxy.h b/include/types/proxy.h
index 96858280b90eb0e6253c53743b1458382e93e78e..d699bc104ba6bb9fe24874d509c8f953bfab1c6b 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -26,10 +26,10 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 
-#include <haproxy/appsession.h>
-#include <haproxy/chtbl.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/regex.h>
+#include <common/appsession.h>
+#include <common/chtbl.h>
+#include <common/mini-clist.h>
+#include <common/regex.h>
 
 #include <types/buffers.h>
 #include <types/session.h>

diff --git a/include/types/queue.h b/include/types/queue.h
index d35fae9d42273025672a6d71adf4902683265266..1e45b28a4b5645dd6c7f40f873bae713d0f4c89e 100644 (file)
--- a/include/types/queue.h
+++ b/include/types/queue.h
@@ -22,7 +22,7 @@
 #ifndef _TYPES_QUEUE_H
 #define _TYPES_QUEUE_H
 
-#include <haproxy/mini-clist.h>
+#include <common/mini-clist.h>
 
 #include <types/server.h>
 #include <types/session.h>

diff --git a/include/types/server.h b/include/types/server.h
index 56a6b63f0bac89e17eedec7445086f95d3f1d9c8..7c62a3da09589295d495f4768698384751be06d7 100644 (file)
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -25,7 +25,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <haproxy/mini-clist.h>
+#include <common/mini-clist.h>
 
 #include <types/buffers.h>
 #include <types/proxy.h>

diff --git a/include/types/session.h b/include/types/session.h
index e2ae54d7d33f6099a4563e54043d4c81da9e4290..8a5d0a450f07cbe05d65021aac6f052477f01235 100644 (file)
--- a/include/types/session.h
+++ b/include/types/session.h
@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <haproxy/mini-clist.h>
+#include <common/mini-clist.h>
 
 #include <types/buffers.h>
 #include <types/proxy.h>

diff --git a/src/appsession.c b/src/appsession.c
index da7315aa751cd3ca6f2fdff0aeed373f94dbc8e0..58145e1a5c3d709f7873e307c91e6a14a7bbcf13 100644 (file)
--- a/src/appsession.c
+++ b/src/appsession.c
@@ -11,11 +11,12 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
-#include <haproxy/appsession.h>
-#include <haproxy/chtbl.h>
-#include <haproxy/list.h>
-#include <haproxy/time.h>
+#include <common/appsession.h>
+#include <common/chtbl.h>
+#include <common/list.h>
+#include <common/time.h>
 
 #include <types/buffers.h>
 #include <types/global.h>

diff --git a/src/backend.c b/src/backend.c
index ec997901f28fd47d661bee424a8bb40566d55cce..df920a0221432e130af06f70f35dcc0950cb4907 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <syslog.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/time.h>
 
 #include <types/buffers.h>
 #include <types/global.h>

diff --git a/src/base64.c b/src/base64.c
index a427d5d8373e924a7d9657ed76ae17905ac7dacd..d730328d716014045c0fc35a069e3c288607e7d9 100644 (file)
--- a/src/base64.c
+++ b/src/base64.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <haproxy/base64.h>
+#include <common/base64.h>
 
 const char base64tab[64]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 52b6e0865fd59b63af63ea1bdd0b26312f0756a6..cfca6c9a2eda7b33b1df87424d338c9d6e9a2e33 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -16,12 +16,12 @@
 #include <netdb.h>
 #include <ctype.h>
 
-#include <haproxy/cfgparse.h>
-#include <haproxy/config.h>
-#include <haproxy/memory.h>
-#include <haproxy/standard.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth.h>
+#include <common/cfgparse.h>
+#include <common/config.h>
+#include <common/memory.h>
+#include <common/standard.h>
+#include <common/time.h>
+#include <common/uri_auth.h>
 
 #include <types/capture.h>
 #include <types/global.h>

diff --git a/src/checks.c b/src/checks.c
index 8fd3e8e7cdda1bd1668dedb491b8d4aa006e4b97..fd0f10637560bba60e773cd239e77be67f82c65c 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -13,15 +13,16 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/mini-clist.h>
+#include <common/time.h>
 
 #include <types/global.h>
 #include <types/polling.h>

diff --git a/src/chtbl.c b/src/chtbl.c
index c8e794fd389602ebcbaabb7739a38857aaa2d96a..7773d403e1460a85d541502bfc25ec76cc2680ba 100644 (file)
--- a/src/chtbl.c
+++ b/src/chtbl.c
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/list.h>
-#include <haproxy/chtbl.h>
+#include <common/list.h>
+#include <common/chtbl.h>
 
 /*****************************************************************************
  *                                                                            *

diff --git a/src/client.c b/src/client.c
index d42e8aaddce1eff4431dd5b37d8069edafbd70a0..31da5941acff87eea3bfd2e57a2e6f5b9815a469 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -14,13 +14,14 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/time.h>
 
 #include <types/backend.h>
 #include <types/buffers.h>

diff --git a/src/fd.c b/src/fd.c
index b7ff8add74ea664f000941674c837512cc861670..ec0607ebafa308acd9938f569883a9a9ba44a6d3 100644 (file)
--- a/src/fd.c
+++ b/src/fd.c
@@ -29,9 +29,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/time.h>
 
 #include <types/fd.h>
 #include <types/global.h>
@@ -64,6 +64,8 @@ int cfg_polling_mechanism = 0;  /* POLL_USE_{SELECT|POLL|EPOLL} */
 fd_set *PrevReadEvent = NULL, *PrevWriteEvent = NULL;
 
 #if defined(USE_MY_EPOLL)
+#include <errno.h>
+#include <sys/syscall.h>
 _syscall1 (int, epoll_create, int, size);
 _syscall4 (int, epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, event);
 _syscall4 (int, epoll_wait, int, epfd, struct epoll_event *, events, int, maxevents, int, timeout);

diff --git a/src/haproxy.c b/src/haproxy.c
index e339a7b04712de0150dcc2f8e4943cd32dd292a0..917e2022775354d083c82b3f12497ddf724a3b70 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -58,19 +58,19 @@
 #include <assert.h>
 #endif
 
-#include <haproxy/appsession.h>
-#include <haproxy/base64.h>
-#include <haproxy/cfgparse.h>
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/defaults.h>
-#include <haproxy/memory.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/regex.h>
-#include <haproxy/standard.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth.h>
-#include <haproxy/version.h>
+#include <common/appsession.h>
+#include <common/base64.h>
+#include <common/cfgparse.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/defaults.h>
+#include <common/memory.h>
+#include <common/mini-clist.h>
+#include <common/regex.h>
+#include <common/standard.h>
+#include <common/time.h>
+#include <common/uri_auth.h>
+#include <common/version.h>
 
 #include <types/capture.h>
 #include <types/global.h>

diff --git a/src/hashpjw.c b/src/hashpjw.c
index 78c0a5be7bf971a8e94f851d29cac49b8776b88b..69fa1b919746ea90c0d1c8f34b7fe304746de287 100644 (file)
--- a/src/hashpjw.c
+++ b/src/hashpjw.c
@@ -16,8 +16,8 @@
 *                                                                            *
 *****************************************************************************/
 
-#include <haproxy/hashpjw.h>
-#include <haproxy/appsession.h>
+#include <common/hashpjw.h>
+#include <common/appsession.h>
 
 /*****************************************************************************
 *                                                                            *

diff --git a/src/list.c b/src/list.c
index 0eaf6ce3292d625b9328d6ee521af95ad57463fe..ae79a0cb92356193e79db2d8e28b92defd23abe3 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/list.h>
+#include <common/list.h>
 
 /*****************************************************************************
 *                                                                            *

diff --git a/src/log.c b/src/log.c
index d311ac88882a0d58ba793e1b5b35fba74c46be4e..34cf52532b879c7e971da80a97ddf5d1f2460406 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -20,7 +20,7 @@
 
 #include <sys/time.h>
 
-#include <haproxy/standard.h>
+#include <common/standard.h>
 
 #include <types/backend.h>
 #include <types/global.h>

diff --git a/src/polling.c b/src/polling.c
index af0129050e898cb256a627b83a1c783aab914b62..9264a50b6d0d558da2eb49be3a218a27dbb4ca88 100644 (file)
--- a/src/polling.c
+++ b/src/polling.c
@@ -14,9 +14,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/time.h>
 
 #include <types/fd.h>
 #include <types/global.h>

diff --git a/src/proto_http.c b/src/proto_http.c
index 9368362639098bbe1fa109f6b51761af97da5f39..0c24a05a1bfd829e3d269ae3a310f7705e2c066e 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -22,15 +22,15 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <haproxy/appsession.h>
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/memory.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/standard.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth.h>
-#include <haproxy/version.h>
+#include <common/appsession.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/memory.h>
+#include <common/mini-clist.h>
+#include <common/standard.h>
+#include <common/time.h>
+#include <common/uri_auth.h>
+#include <common/version.h>
 
 #include <types/capture.h>
 #include <types/client.h>

diff --git a/src/proxy.c b/src/proxy.c
index b1beb4b744856a3600b47b099d2be119e1e3a04b..19273db932bb2672c4a1cd75ab2144ffd945d928 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -16,9 +16,9 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
-#include <haproxy/defaults.h>
-#include <haproxy/compat.h>
-#include <haproxy/time.h>
+#include <common/defaults.h>
+#include <common/compat.h>
+#include <common/time.h>
 
 #include <types/global.h>
 #include <types/polling.h>

diff --git a/src/queue.c b/src/queue.c
index 67c0d7cc6b6231a69031827b995101d82f66ee33..a12f31373ad5575ee14b35938669a30f06423752 100644 (file)
--- a/src/queue.c
+++ b/src/queue.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <haproxy/time.h>
+#include <common/time.h>
 
 #include <types/proxy.h>
 #include <types/session.h>

diff --git a/src/regex.c b/src/regex.c
index 4c3776012f708dcca8d17b996d71f7d619a8d4d1..9db3d1015af16dc5d765a4d7547e74b4daf40eea 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -14,8 +14,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/regex.h>
-#include <haproxy/standard.h>
+#include <common/regex.h>
+#include <common/standard.h>
 #include <proto/log.h>
 
 /* regex trash buffer used by various regex tests */

diff --git a/src/session.c b/src/session.c
index 0722d0f4cd33182a5ea9553d15dea431b56b6e43..e057b152431856f6769bf3030e4041fd26d98e34 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -11,7 +11,7 @@
  */
 
 #include <stdlib.h>
-#include <haproxy/memory.h>
+#include <common/memory.h>
 
 #include <types/backend.h>
 #include <types/capture.h>

diff --git a/src/standard.c b/src/standard.c
index e218055faaa1482689198b8a6d61f2b1fc50004b..7ddb88a81ab99d441d188796f9608edb64e86fc8 100644 (file)
--- a/src/standard.c
+++ b/src/standard.c
@@ -16,7 +16,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <haproxy/standard.h>
+#include <common/standard.h>
 #include <proto/log.h>
 
 /* enough to store 2^63=18446744073709551615 */

diff --git a/src/stream_sock.c b/src/stream_sock.c
index e3054611723cd61e525e26265c406e00f90a046e..d8a99bff03ab5b883e657e44d0e2beeb95ce0938 100644 (file)
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -19,8 +19,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/time.h>
 
 #include <types/backend.h>
 #include <types/buffers.h>

diff --git a/src/task.c b/src/task.c
index 2c4adee3e0b3c007b2ad09a9f17145b45687cce7..1f567b9240f6fadcbb977613560aa436f8e9c5db 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -10,9 +10,9 @@
  *
  */
 
-#include <haproxy/config.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/time.h>
+#include <common/config.h>
+#include <common/mini-clist.h>
+#include <common/time.h>
 
 #include <proto/task.h>
 

diff --git a/src/time.c b/src/time.c
index d495ed1666b6b6edd20fa331d513f186ddd2cdbe..e573b9d9c4bd87b17317a0b443c62a559e46f5df 100644 (file)
--- a/src/time.c
+++ b/src/time.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/time.h>
-#include <haproxy/time.h>
+#include <common/time.h>
 
 struct timeval now;             /* the current date at any moment */
 struct timeval start_date;      /* the process's start date */

diff --git a/src/uri_auth.c b/src/uri_auth.c
index 498d73512731db51be2dde4875526f8842f3731e..661419a21f5e8969612aad182d06e13fe89dcb89 100644 (file)
--- a/src/uri_auth.c
+++ b/src/uri_auth.c
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/base64.h>
-#include <haproxy/uri_auth.h>
+#include <common/base64.h>
+#include <common/uri_auth.h>
 
 
 /*