From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Nov 2013 15:44:59 +0000 (+0100)
Subject: shutdown: as sd-shutdown.h is a drop-in header it should not include any other header... 
X-Git-Tag: v209~1551
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=2cd33d82b6b4dd3eec3ccf6b8da36f3f3312ff32;p=elogind.git

shutdown: as sd-shutdown.h is a drop-in header it should not include any other headers of ours
---

diff --git a/src/systemd/sd-shutdown.h b/src/systemd/sd-shutdown.h
index 6698c8c5c..1d6554988 100644
--- a/src/systemd/sd-shutdown.h
+++ b/src/systemd/sd-shutdown.h
@@ -26,7 +26,13 @@
 
 #include <inttypes.h>
 
-#include "_sd-common.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _sd_packed_
+#  define _sd_packed_ __attribute__((packed))
+#endif
 
 typedef enum sd_shutdown_mode {
         SD_SHUTDOWN_NONE = 0,
@@ -107,4 +113,8 @@ struct sd_shutdown_command {
  * anybody.
  */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif