diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 08:43:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 08:43:34 -0400 |
| commit | 670b77ddfab0f4eddbe539964aba83d446d48129 (patch) | |
| tree | 5b159fe9bd52169e05cdc60db5a48a5c5ac9602a /src/libudev | |
| parent | 23708daf3ba69ba9880102b4f720a3842883332e (diff) | |
| parent | 34dbdee3b2f122d2ef903a368b172e75f962b66a (diff) | |
Merge branch 'lukeshu/postmove' into 'lukeshu/master'
Diffstat (limited to 'src/libudev')
| -rw-r--r-- | src/libudev/include/libudev.h | 1 | ||||
| -rw-r--r-- | src/libudev/src/libudev-device-internal.h | 4 | ||||
| -rw-r--r-- | src/libudev/src/libudev-enumerate.c | 2 | ||||
| -rw-r--r-- | src/libudev/src/udev.h | 11 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/libudev/include/libudev.h b/src/libudev/include/libudev.h index eb58740d26..3f6d0ed16c 100644 --- a/src/libudev/include/libudev.h +++ b/src/libudev/include/libudev.h @@ -21,6 +21,7 @@ #define _LIBUDEV_H_ #include <stdarg.h> +#include <sys/sysmacros.h> #include <sys/types.h> #ifdef __cplusplus diff --git a/src/libudev/src/libudev-device-internal.h b/src/libudev/src/libudev-device-internal.h index de6f680819..f76da09407 100644 --- a/src/libudev/src/libudev-device-internal.h +++ b/src/libudev/src/libudev-device-internal.h @@ -1,3 +1,5 @@ +#pragma once + /*** This file is part of systemd. @@ -18,8 +20,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#pragma once - #include "libudev.h" #include <systemd/sd-device.h> diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c index c784da5715..9910cea957 100644 --- a/src/libudev/src/libudev-enumerate.c +++ b/src/libudev/src/libudev-enumerate.c @@ -112,7 +112,7 @@ _public_ struct udev_enumerate *udev_enumerate_new(struct udev *udev) { **/ _public_ struct udev_enumerate *udev_enumerate_ref(struct udev_enumerate *udev_enumerate) { if (udev_enumerate) - udev_enumerate->refcount ++; + udev_enumerate->refcount++; return udev_enumerate; } diff --git a/src/libudev/src/udev.h b/src/libudev/src/udev.h index 91dfc950b4..00de88972a 100644 --- a/src/libudev/src/udev.h +++ b/src/libudev/src/udev.h @@ -1,3 +1,5 @@ +#pragma once + /* * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> * Copyright (C) 2003-2010 Kay Sievers <kay@vrfy.org> @@ -16,9 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#pragma once - #include <sys/param.h> +#include <sys/sysmacros.h> #include <sys/types.h> #include "libudev.h" @@ -71,9 +72,9 @@ struct udev_rules; struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names); struct udev_rules *udev_rules_unref(struct udev_rules *rules); bool udev_rules_check_timestamp(struct udev_rules *rules); -int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, - usec_t timeout_usec, usec_t timeout_warn_usec, - struct udev_list *properties_list); +void udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, + usec_t timeout_usec, usec_t timeout_warn_usec, + struct udev_list *properties_list); int udev_rules_apply_static_dev_perms(struct udev_rules *rules); /* udev-event.c */ |