d743bb5bcc
This reverts commits3fb4a15096and0e8350ca14. Either building with meson or other upstream changes was causing issues with booting, and I didn't have time to debug this properly.
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From cc60212ef3acc982eb0da5f2e6839af84a3a2f10 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Mon, 13 Mar 2017 03:11:24 -0400
|
|
Subject: [PATCH] headers: check that __INCLUDE_LEVEL__ is defined before using
|
|
it (#5575)
|
|
|
|
That macro is a gcc extension, and while widely supported, not ubiquitous.
|
|
In particular the coverity scanner is having trouble with it.
|
|
(cherry picked from commit 1070d271fa8fa553d57dd5f74dd1e3f60732d0b9)
|
|
---
|
|
src/systemd/_sd-common.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h
|
|
index 3bb886be75..97c3943861 100644
|
|
--- a/src/systemd/_sd-common.h
|
|
+++ b/src/systemd/_sd-common.h
|
|
@@ -22,8 +22,8 @@
|
|
|
|
/* This is a private header; never even think of including this directly! */
|
|
|
|
-#if __INCLUDE_LEVEL__ <= 1
|
|
-#error "Do not include _sd-common.h directly; it is a private header."
|
|
+#if defined(__INCLUDE_LEVEL__) && __INCLUDE_LEVEL__ <= 1
|
|
+# error "Do not include _sd-common.h directly; it is a private header."
|
|
#endif
|
|
|
|
#ifndef _sd_printf_
|