2015-06-11 14:38 GMT+02:00 Lukas Tribus <luky...@hotmail.com>:
>> Hi Lukas,
>> This is the last commit available on github for haproxy/haproxy
>> https://github.com/haproxy/haproxy/commit/80b59eb0d20245b4040f8ee0baae0d36b6c446b5
>
> That is a unofficial mirror, updated manually and often
> outdated (like right now).
>
> Please clone from the official mirror at:
> http://git.haproxy.org/git/haproxy.git/

Ok. I have checked out the main repo
I'm at 28b48ccbc879a552f988e6e1db22941e3362b4db
>
>
> This will probably not help with the issue you are facing, but
> at least we have the same commit hash.

Same issue same solution with minor adjustments for the patch to apply

Joris

diff --git a/include/common/compat.h b/include/common/compat.h
index ecbc3b1..48ea1f7 100644
--- a/include/common/compat.h
+++ b/include/common/compat.h
@@ -27,6 +27,8 @@
 #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 27b8f14..5833cfc 100644
--- a/include/common/config.h
+++ b/include/common/config.h
@@ -23,7 +23,6 @@
 #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 b3b9672..3812771 100644
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -25,7 +25,6 @@
 #include <netinet/in.h>

 #include <common/config.h>
-#include <common/standard.h>
 #include <import/da.h>
 #include <types/freq_ctr.h>
 #include <types/listener.h>



>
>
>
>
> Thanks,
>
> Lukas
>
>

Reply via email to