From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 16 Oct 2012 14:26:41 +0000 (+0200)
Subject: journal: don't export MESSAGE_ID() macro
X-Git-Tag: v195~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=706911fba8d071449848f02516eef117277ff48b;p=thirdparty%2Fsystemd.git

journal: don't export MESSAGE_ID() macro

If it is exported it would need to be prefixed, but since we need it
exclusively internally so far, simply move it to an internal header.
---

diff --git a/src/shared/log.h b/src/shared/log.h
index c242cc219fc..1bd9dbf27ae 100644
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -135,3 +135,5 @@ bool log_on_console(void);
 
 const char *log_target_to_string(LogTarget target);
 LogTarget log_target_from_string(const char *s);
+
+#define MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x)
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index fa17be84347..05521ae4bbe 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -65,7 +65,6 @@ static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) {
 }
 
 #define SD_ID128_NULL ((sd_id128_t) { .qwords = { 0, 0 }})
-#define MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x)
 
 #ifdef __cplusplus
 }