diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-08-01 08:56:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-08-01 08:56:59 +0200 |
| commit | 5101c49a2f012c6701222950cee2f3dd4701abf1 (patch) | |
| tree | e99ba0cb9a6f3966343609c3348bc17f9499603d /package/squid/patches | |
| parent | a59afdda1ae3290da090a878a1e0893a3a0f01e0 (diff) | |
| parent | 0da10a5f4ffedb7628ab5b324b54c3a02e51772d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/squid/patches')
| -rw-r--r-- | package/squid/patches/patch-include_squid_endian_h | 15 | ||||
| -rw-r--r-- | package/squid/patches/patch-include_squid_types_h | 31 |
2 files changed, 46 insertions, 0 deletions
diff --git a/package/squid/patches/patch-include_squid_endian_h b/package/squid/patches/patch-include_squid_endian_h new file mode 100644 index 000000000..b89b1121c --- /dev/null +++ b/package/squid/patches/patch-include_squid_endian_h @@ -0,0 +1,15 @@ +--- squid-3.1.4.orig/include/squid_endian.h 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/include/squid_endian.h 2010-07-31 14:29:02.000000000 +0200 +@@ -65,9 +65,12 @@ + * + * Some systems define htobe16()/be16toh() and friends in <sys/endian.h>. + */ ++#include <sys/param.h> ++#if !defined(BSD) + #if HAVE_BYTESWAP_H + # include <byteswap.h> + #endif /* HAVE_BYTESWAP_H */ ++#endif + #ifdef HAVE_MACHINE_BYTE_SWAP_H + # include <machine/byte_swap.h> + #endif /* HAVE_MACHINE_BYTE_SWAP_H */ diff --git a/package/squid/patches/patch-include_squid_types_h b/package/squid/patches/patch-include_squid_types_h new file mode 100644 index 000000000..ae6bd3de3 --- /dev/null +++ b/package/squid/patches/patch-include_squid_types_h @@ -0,0 +1,31 @@ +--- squid-3.1.4.orig/include/squid_types.h 2010-05-30 15:21:12.000000000 +0200 ++++ squid-3.1.4/include/squid_types.h 2010-07-31 14:28:05.000000000 +0200 +@@ -56,13 +56,16 @@ + #ifndef SQUID_TYPES_H + #define SQUID_TYPES_H + ++#include <sys/param.h> + /* This should be in synch with what we have in acinclude.m4 */ + #if HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif ++#if !defined(BSD) + #if HAVE_LINUX_TYPES_H + #include <linux/types.h> + #endif ++#endif + #if STDC_HEADERS + #include <stdlib.h> + #include <stddef.h> +@@ -70,9 +73,11 @@ + #if HAVE_INTTYPES_H + #include <inttypes.h> + #endif ++#if !defined(BSD) + #if HAVE_SYS_BITYPES_H + #include <sys/bitypes.h> + #endif ++#endif + #if HAVE_SYS_SELECT_H + #include <sys/select.h> + #endif |