Prep v231: Apply missing fixes from upstream (5/6) src/shared

[elogind.git] / src / basic / missing.h

diff --git a/src/basic/missing.h b/src/basic/missing.h
index c33439ddea8cf48af702d80570e6e42c676b0ac6..322cb5695b3d59c36acecb488677dc5f0cbde8a0 100644 (file)
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -38,6 +38,7 @@
 #include <uchar.h>
 #include <unistd.h>
 
+/// Additional includes needed by elogind
 #include "musl_missing.h"
 
 #ifdef HAVE_AUDIT
@@ -582,6 +583,9 @@ struct btrfs_ioctl_quota_ctl_args {
 
 #define IN6_ADDR_GEN_MODE_EUI64 0
 #define IN6_ADDR_GEN_MODE_NONE 1
+#endif
+
+#if !HAVE_DECL_IN6_ADDR_GEN_MODE_STABLE_PRIVACY
 #define IN6_ADDR_GEN_MODE_STABLE_PRIVACY 2
 #endif
 
@@ -987,11 +991,13 @@ struct btrfs_ioctl_quota_ctl_args {
 #ifndef INPUT_PROP_ACCELEROMETER
 #define INPUT_PROP_ACCELEROMETER  0x06
 #endif
+#endif // 0
 
 #ifndef HAVE_KEY_SERIAL_T
 typedef int32_t key_serial_t;
 #endif
 
+#if 0 /// UNNEEDED by elogind
 #ifndef KEYCTL_READ
 #define KEYCTL_READ 11
 #endif