From: Martin Willi <martin@revosec.ch>
Date: Wed, 3 Mar 2010 09:44:01 +0000 (+0100)
Subject: Use "static const", some GCCs don't like "const static"
X-Git-Tag: 4.4.0~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1abab9ec4f69fa9629df2e0b6b0b68ab48efc1ce;p=thirdparty%2Fstrongswan.git

Use "static const", some GCCs don't like "const static"
---

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