Merge branch 'glibc' into 'master'

disable fork-malloc-exec for non-glibc-systems See merge request !181

Merge branch 'glibc' into 'master'
disable fork-malloc-exec for non-glibc-systems See merge request !181
2285db23 · Simon McVittie · bf51a316 · 3fab06d6 · 2285db23
Commit 2285db23 authored Sep 28, 2020 by Simon McVittie
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

dbus/dbus-sysdeps-unix.c dbus/dbus-sysdeps-unix.c +1 -1

No files found.
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -4742,7 +4742,7 @@ act_on_fds_3_and_up (void (*func) (int fd))
 {
  int maxfds, i;

-#ifdef __linux__
+#if defined(__linux__) && defined(__GLIBC__)
  DIR *d;

  /* On Linux we can optimize this a bit if /proc is available. If it