Merge patches from Hleb Valoshka

[elogind.git] / src / shared / udev-util.h

diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index a83daa7f1d300e7bc8f4894a529651b77c3d17f1..bbbdd7b955527be380b9a81f22e111624eedbdd4 100644 (file)
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -21,7 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#if 0 /// elogind needs the systems udev header
+#include "udev.h"
+#else
 #include <libudev.h>
+#endif // 0
 #include "util.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref);
@@ -48,3 +50,5 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_monitor*, udev_monitor_unref);
 #endif // 0
 #define _cleanup_udev_monitor_unref_ _cleanup_(udev_monitor_unrefp)
 #define _cleanup_udev_list_cleanup_ _cleanup_(udev_list_cleanup)
+
+int udev_parse_config(void);