Author: Alin Nastac <mrness@gentoo.org>

Cleanup: deprecate ugly hack for sys/capability.h

Needed once to prevent build clashes between libc and sys/capabilility.h
headers. As of libcap2.16 that is no longer the case and in fact prevents
a clean build.

Left in libcompat but removed from active build until its clear whether
full erasure is possible or if some systems still need it.

diff --git a/compat/os/linux.h b/compat/os/linux.h
index 947de9870abef626151c22b8bf0e6d05be39fb7e..27ea415b141cadc0f7a35683613e039c1c554527 100644 (file)
--- a/compat/os/linux.h
+++ b/compat/os/linux.h
@@ -27,5 +27,25 @@
 #endif
 
 
+/*
+ * sys/capability.h is only needed in Linux apparently.
+ *
+ * HACK: Ugly glue to get around linux header madness colliding with glibc
+ * NP: if you need to use the hack labeled MAYBE_DEAD please report to
+ *     the developers.
+ */
+#if HAVE_SYS_CAPABILITY_H
+
+#if MAYBE_DEAD
+#undef _POSIX_SOURCE
+#define _LINUX_TYPES_H
+#define _LINUX_FS_H
+typedef uint32_t __u32;
+#endif
+
+#include <sys/capability.h>
+#endif /* HAVE_SYS_CAPABILITY_H */
+
+
 #endif /* _SQUID_LINUX_ */
 #endif /* SQUID_OS_LINUX_H */

diff --git a/src/tools.cc b/src/tools.cc
index e83e5159a49c0ee5fb9ee2bedbc98274708fc145..311f007fc36698bccefc512d164938c62662a247 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -41,17 +41,6 @@
 #include "SquidTime.h"
 #include "ip/IpIntercept.h"
 
-#ifdef _SQUID_LINUX_
-#if HAVE_SYS_CAPABILITY_H
-#undef _POSIX_SOURCE
-/* Ugly glue to get around linux header madness colliding with glibc */
-#define _LINUX_TYPES_H
-#define _LINUX_FS_H
-typedef uint32_t __u32;
-#include <sys/capability.h>
-#endif
-#endif
-
 #if HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif