X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevd.c;h=2cd3622ce011a5a04630ff8d05595dbd6d53fc81;hb=92ebb398ed004348d5f92a242f323fb25dc7d6e5;hp=bd21f156146e7bc0162901f11d394a23c3948fad;hpb=f8a178a35b8dee2ee46a3de298345aa4faa8f41e;p=elogind.git

diff --git a/udevd.c b/udevd.c
index bd21f1561..2cd3622ce 100644
--- a/udevd.c
+++ b/udevd.c
@@ -1,7 +1,7 @@
 /*
  * udevd.c - hotplug event serializer
  *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
  *
  *
@@ -21,7 +21,6 @@
  */
 
 #include <stddef.h>
-#include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>
@@ -31,6 +30,8 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <fcntl.h>
+#include <sys/select.h>
+#include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -39,6 +40,7 @@
 #include <sys/stat.h>
 
 #include "list.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_utils.h"
@@ -67,7 +69,7 @@ static void user_sighandler(void);
 static void reap_sigchilds(void);
 char *udev_bin;
 
-#ifdef LOG
+#ifdef USE_LOG
 void log_message (int level, const char *format, ...)
 {
 	va_list	args;
@@ -262,7 +264,7 @@ static int compare_devpath(const char *running, const char *waiting)
 {
 	int i;
 
-	for (i = 0; i < DEVPATH_SIZE; i++) {
+	for (i = 0; i < PATH_SIZE; i++) {
 		/* identical device event found */
 		if (running[i] == '\0' && waiting[i] == '\0')
 			return 1;