From: Martin Willi <martin@revosec.ch>
Date: Mon, 14 May 2012 12:10:00 +0000 (+0200)
Subject: Make function pointer defined with METHOD() macro non-const
X-Git-Tag: 5.0.0~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d185b6acee2193e13e5b3adafa36c4923f1d36cc;p=thirdparty%2Fstrongswan.git

Make function pointer defined with METHOD() macro non-const

clang complains about it being const, and the object code
generated from gcc is the same.
---

diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index d09319d0d0..6334b8e010 100644
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -135,7 +135,7 @@
 #define METHOD(iface, name, ret, this, ...) \
 	static ret name(union {iface *_public; this;} \
 	__attribute__((transparent_union)), ##__VA_ARGS__); \
-	static const typeof(name) *_##name = (const typeof(name)*)name; \
+	static typeof(name) *_##name = (typeof(name)*)name; \
 	static ret name(this, ##__VA_ARGS__)
 
 /**
@@ -144,7 +144,7 @@
 #define METHOD2(iface1, iface2, name, ret, this, ...) \
 	static ret name(union {iface1 *_public1; iface2 *_public2; this;} \
 	__attribute__((transparent_union)), ##__VA_ARGS__); \
-	static const typeof(name) *_##name = (const typeof(name)*)name; \
+	static typeof(name) *_##name = (typeof(name)*)name; \
 	static ret name(this, ##__VA_ARGS__)
 
 /**