43 lines
1.2 KiB
Plaintext
43 lines
1.2 KiB
Plaintext
$OpenBSD: patch-scheduler_main_c,v 1.9 2012/10/01 12:47:55 ajacoutot Exp $
|
|
|
|
https://www.cups.org/str.php?L4197
|
|
|
|
--- scheduler/main.c.orig Mon Apr 23 21:19:19 2012
|
|
+++ scheduler/main.c Mon Oct 1 14:39:10 2012
|
|
@@ -65,11 +65,16 @@
|
|
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
|
|
# include <malloc.h>
|
|
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
|
|
+
|
|
#ifdef HAVE_NOTIFY_H
|
|
# include <notify.h>
|
|
#endif /* HAVE_NOTIFY_H */
|
|
|
|
+#ifdef HAVE_SYS_PARAM_H
|
|
+# include <sys/param.h>
|
|
+#endif /* HAVE_SYS_PARAM_H */
|
|
|
|
+
|
|
/*
|
|
* Local functions...
|
|
*/
|
|
@@ -365,15 +370,15 @@ main(int argc, /* I - Number of command-line args
|
|
}
|
|
}
|
|
|
|
-#ifdef __OpenBSD__
|
|
+#if defined(__OpenBSD__) && OpenBSD < 201211
|
|
/*
|
|
* Call _thread_sys_closefrom() so the child process doesn't reset the
|
|
* parent's file descriptors to be blocking. This is a workaround for a
|
|
- * limitation of userland libpthread on OpenBSD.
|
|
+ * limitation of userland libpthread on older versions of OpenBSD.
|
|
*/
|
|
|
|
_thread_sys_closefrom(0);
|
|
-#endif /* __OpenBSD__ */
|
|
+#endif /* __OpenBSD__ && OpenBSD < 201211 */
|
|
|
|
/*
|
|
* Since CoreFoundation and DBUS both create fork-unsafe data on execution of
|