Use "static const", some GCCs don't like "const static"
authorMartin Willi <martin@revosec.ch>
Wed, 3 Mar 2010 09:44:01 +0000 (10:44 +0100)
committerMartin Willi <martin@revosec.ch>
Wed, 3 Mar 2010 09:44:49 +0000 (10:44 +0100)
src/libstrongswan/utils.h

index 5625217..367e75e 100644 (file)
 #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__)
 
 /**
 #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__)
 
 /**