On Wed, Nov 11, 2009 at 10:52:09PM +0100, Manuel Prinz wrote:
> Am Mittwoch, den 11.11.2009, 09:26 -0700 schrieb dann frazier:
> > > Several autoconf-scripts (notably strace) try to compile this program to
> > > detect "linux/netlink.h" and consequently fail. Please revert the change
> > > that
> > > remove the sub-includes from linux/socket.h
>
> I can confirm the breakage (patch applied on a Sid system.)
>
> > Does anyone have an alternate fix, or should we just revert this for
> > now?
>
> I tested several variations of the patch. Re-adding the "#if
> defined ..." line (or: removing that hunk from the patch) gives a
> version under which both test cases compile successfully. (The one
> mentioned by Helge and the one by the bug submitter.)
Could you test this:
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -16,7 +16,12 @@ struct __kernel_sockaddr_storage {
/* _SS_MAXSIZE value minus size of ss_family */
} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */
-#ifdef __KERNEL__
+#ifndef __KERNEL__
+
+/* I think this is what you wanted: */
+#include <sys/socket.h>
+
+#else
#include <asm/socket.h> /* arch-dependent defines
*/
#include <linux/sockios.h> /* the SIOCxxx I/O controls */
--- END ---
Ben.
--
Ben Hutchings
Lowery's Law:
If it jams, force it. If it breaks, it needed replacing anyway.
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
