mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-06 05:47:13 +02:00
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
--- a/src/systemd/src/basic/stdio-util.h
|
|
+++ b/src/systemd/src/basic/stdio-util.h
|
|
@@ -19,7 +19,9 @@
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
+#if defined(__GLIBC__)
|
|
#include <printf.h>
|
|
+#endif
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
--- a/src/systemd/src/basic/util.h
|
|
+++ b/src/systemd/src/basic/util.h
|
|
@@ -46,6 +46,11 @@
|
|
#include "missing.h"
|
|
#include "time-util.h"
|
|
|
|
+#if !defined(__GLIBC__)
|
|
+typedef int (*__compar_fn_t) (const void*, const void*);
|
|
+typedef __compar_fn_t comparison_fn_t;
|
|
+#endif
|
|
+
|
|
size_t page_size(void) _pure_;
|
|
#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
|
|
|
|
--- a/src/systemd/src/basic/parse-util.c
|
|
+++ b/src/systemd/src/basic/parse-util.c
|
|
@@ -25,7 +25,11 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
+#if defined(__GLIBC__)
|
|
#include <xlocale.h>
|
|
+#else
|
|
+#include <locale.h>
|
|
+#endif
|
|
|
|
#include "alloc-util.h"
|
|
#include "extract-word.h"
|
|
--- a/src/systemd/sd-adapt/nm-sd-adapt.h
|
|
+++ b/src/systemd/sd-adapt/nm-sd-adapt.h
|
|
@@ -119,7 +119,7 @@
|
|
# ifdef HAVE___SECURE_GETENV
|
|
# define secure_getenv __secure_getenv
|
|
# else
|
|
-# error neither secure_getenv nor __secure_getenv is available
|
|
+# define secure_getenv getenv
|
|
# endif
|
|
#endif
|
|
|
|
--- a/src/systemd/src/systemd/sd-event.h
|
|
+++ b/src/systemd/src/systemd/sd-event.h
|
|
@@ -69,11 +69,7 @@
|
|
typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata);
|
|
typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata);
|
|
typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata);
|
|
-#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED
|
|
typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata);
|
|
-#else
|
|
-typedef void* sd_event_child_handler_t;
|
|
-#endif
|
|
|
|
int sd_event_default(sd_event **e);
|
|
|