Merge branch 'master' of github.com:Themaister/SSNES

This commit is contained in:
Twinaphex 2012-03-28 23:22:54 +02:00
commit 105b6dbddc
1 changed files with 4 additions and 4 deletions

View File

@ -23,25 +23,25 @@
#include <stdint.h> #include <stdint.h>
#define CONFIG_GET_BOOL_BASE(conf, base, var, key) do { \ #define CONFIG_GET_BOOL_BASE(conf, base, var, key) do { \
bool tmp; \ bool tmp = false; \
if (config_get_bool(conf, key, &tmp)) \ if (config_get_bool(conf, key, &tmp)) \
base.var = tmp; \ base.var = tmp; \
} while(0) } while(0)
#define CONFIG_GET_INT_BASE(conf, base, var, key) do { \ #define CONFIG_GET_INT_BASE(conf, base, var, key) do { \
int tmp; \ int tmp = 0; \
if (config_get_int(conf, key, &tmp)) \ if (config_get_int(conf, key, &tmp)) \
base.var = tmp; \ base.var = tmp; \
} while(0) } while(0)
#define CONFIG_GET_UINT64_BASE(conf, base, var, key) do { \ #define CONFIG_GET_UINT64_BASE(conf, base, var, key) do { \
uint64_t tmp; \ uint64_t tmp = 0; \
if (config_get_int(conf, key, &tmp)) \ if (config_get_int(conf, key, &tmp)) \
base.var = tmp; \ base.var = tmp; \
} while(0) } while(0)
#define CONFIG_GET_FLOAT_BASE(conf, base, var, key) do { \ #define CONFIG_GET_FLOAT_BASE(conf, base, var, key) do { \
float tmp; \ float tmp = 0.0f; \
if (config_get_float(conf, key, &tmp)) \ if (config_get_float(conf, key, &tmp)) \
base.var = tmp; \ base.var = tmp; \
} while(0) } while(0)