From: Kay Sievers Date: Thu, 7 May 2009 11:24:40 +0000 (+0200) Subject: add "static" back to the inline functions X-Git-Tag: 174~1053 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4a74214a585ce3a6130ed8c5c383bc4db0112326 add "static" back to the inline functions kay: udev git head ftbfs udev-watch.o: In function `udev_selinux_init': /../udev/udev.h:130: multiple definition of `udev_selinux_init' --- diff --git a/udev/udev.h b/udev/udev.h index 478a51f3d..abf354a66 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -127,11 +127,11 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string, /* udev-selinux.c */ #ifndef USE_SELINUX -inline void udev_selinux_init(struct udev *udev) {} -inline void udev_selinux_exit(struct udev *udev) {} -inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {} -inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {} -inline void udev_selinux_resetfscreatecon(struct udev *udev) {} +static inline void udev_selinux_init(struct udev *udev) {} +static inline void udev_selinux_exit(struct udev *udev) {} +static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {} +static inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {} +static inline void udev_selinux_resetfscreatecon(struct udev *udev) {} #else void udev_selinux_init(struct udev *udev); void udev_selinux_exit(struct udev *udev);