/pidgin/main: 27580a47ae28: Oops, bad merge

[Tomasz Wasilczyk]

Changeset: 27580a47ae284dadd71a600a6f67a5fa448e77db
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-11 22:31 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/27580a47ae28

Description:

Oops, bad merge

diffstat:

 libpurple/internal.h |  16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diffs (26 lines):

diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -149,6 +149,22 @@
 	[(condition) ? 1 : -1]; static_assertion_failed_ ## message dummy; \
 	(void)dummy; }
 
+#ifdef __clang__
+
+#define PURPLE_BEGIN_IGNORE_CAST_ALIGN \
+	_Pragma ("clang diagnostic push") \
+	_Pragma ("clang diagnostic ignored \"-Wcast-align\"")
+
+#define PURPLE_END_IGNORE_CAST_ALIGN \
+	_Pragma ("clang diagnostic pop")
+
+#else
+
+#define PURPLE_BEGIN_IGNORE_CAST_ALIGN
+#define PURPLE_END_IGNORE_CAST_ALIGN
+
+#endif /* __clang__ */
+
 #include <glib-object.h>
 
 typedef union