From: Kay Sievers <kay.sievers@suse.de>
Date: Mon, 1 May 2006 18:36:21 +0000 (+0200)
Subject: fix offsetof() build issue with recent glibc
X-Git-Tag: 174~2269
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9571122e00f54b5d6e5accda4c431ac6ae5c4847

fix offsetof() build issue with recent glibc
---

diff --git a/udevcontrol.c b/udevcontrol.c
index 6d91adc1c..8add09e03 100644
--- a/udevcontrol.c
+++ b/udevcontrol.c
@@ -18,10 +18,6 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/un.h>
 #include <time.h>
 #include <errno.h>
 #include <stdio.h>
@@ -29,7 +25,10 @@
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>
-#include <linux/stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
 
 #include "udev.h"
 #include "udevd.h"
diff --git a/udevmonitor.c b/udevmonitor.c
index 80c49753f..fb1f42cc0 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/udevsend.c b/udevsend.c
index 1b9860bac..9f5059a4c 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -30,7 +30,6 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/un.h>
-#include <linux/stddef.h>
 
 #include "udev.h"
 #include "udevd.h"