[dpkg] 92/187: s-s-d: Use reserved system preprocessor symbols

[Reiner Herrmann]

This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch master
in repository dpkg.

commit 454721714d100209ace5e8151bf9f9019de43ed6
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Aug 27 15:14:35 2016 +0200

    s-s-d: Use reserved system preprocessor symbols
    
    Use underscore-prefixed symbols to distinguish the system we are
    building for.
---
 debian/changelog          | 2 ++
 utils/start-stop-daemon.c | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 828a48b..1c380a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     - Cast off_t variables to intmax_t when printing them with "%jd".
     - Add missing <string.h> include in libdpkg.
     - 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”).
   * 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 ec8fe3b..7152d10 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -25,15 +25,15 @@
 
 #include <dpkg/macros.h>
 
-#if defined(linux)
+#if defined(__linux__)
 #  define OSLinux
 #elif defined(__GNU__)
 #  define OSHurd
 #elif defined(__sun)
 #  define OSsunos
-#elif defined(OPENBSD) || defined(__OpenBSD__)
+#elif defined(__OpenBSD__)
 #  define OSOpenBSD
-#elif defined(hpux)
+#elif defined(__hpux)
 #  define OShpux
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #  define OSFreeBSD

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git