diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | utils/start-stop-daemon.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 1c380a496..477ec514c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium - Cast strlen() return value to ssize_t to match write() return type. - Use underscore-prefixed system preprocessor symbols instead of namespace polluting ones (such as “linux”, “OPENBSD” or “hpux”). + - Handle _POSIX_PRIORITY_SCHEDULING being defined to -1 or 0 in + start-stop-daemon. This affects Mac OS X. * Perl modules: - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors. - Rework keyring hooks in Dpkg::Vendor. Deprecate the keyrings hook, and diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 7152d1044..4245e45aa 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -112,7 +112,7 @@ #endif #endif -#ifdef _POSIX_PRIORITY_SCHEDULING +#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0 #include <sched.h> #else #define SCHED_OTHER -1 @@ -731,7 +731,7 @@ parse_umask(const char *string, int *value_r) static void validate_proc_schedule(void) { -#ifdef _POSIX_PRIORITY_SCHEDULING +#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0 int prio_min, prio_max; prio_min = sched_get_priority_min(proc_sched->policy); @@ -814,7 +814,7 @@ parse_io_schedule(const char *string) static void set_proc_schedule(struct res_schedule *sched) { -#ifdef _POSIX_PRIORITY_SCHEDULING +#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0 struct sched_param param; param.sched_priority = sched->priority; |