macosx: fix main menu initialization order on startup

[vlc] / src / config / configuration.h

diff --git a/src/config/configuration.h b/src/config/configuration.h
index 8c694d7b81bd9c0be57c29bf953ea857ff26c38b..dd02c7f4af2f267fe6788cb718397454030c7cf9 100644 (file)
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -43,22 +43,15 @@ void config_UnsortConfig (void);
 
 #define CONFIG_CLASS(x) ((x) & ~0x1F)
 
-static inline bool IsConfigStringType(unsigned type)
-{
-    return (type & CONFIG_ITEM_STRING) != 0;
-}
-
-static inline bool IsConfigIntegerType (int type)
-{
-    return (type & CONFIG_ITEM_INTEGER) != 0;
-}
-
-static inline bool IsConfigFloatType (int type)
-{
-    return type == CONFIG_ITEM_FLOAT;
-}
+#define IsConfigStringType(type) \
+    (((type) & CONFIG_ITEM_STRING) != 0)
+#define IsConfigIntegerType(type) \
+    (((type) & CONFIG_ITEM_INTEGER) != 0)
+#define IsConfigFloatType(type) \
+    ((type) == CONFIG_ITEM_FLOAT)
 
 extern vlc_rwlock_t config_lock;
+extern bool config_dirty;
 
 bool config_IsSafe (const char *);