diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2011-05-17 21:16:52 +0000 |
|---|---|---|
| committer | Vincent Torri <vincent.torri@gmail.com> | 2011-05-17 21:16:52 +0000 |
| commit | 24fc7ab10e5a2788fbe1bb0973d233e2f438b973 (patch) | |
| tree | 7f87ea9874d6cf5d968861aacab1ba5263c0557e | |
| parent | e82c550ffed7b7fe6abce28746f7d198652978da (diff) | |
| download | eet-24fc7ab10e5a2788fbe1bb0973d233e2f438b973.tar.gz | |
Eet : fix scanf format on Windows
SVN revision: 59476
| -rw-r--r-- | src/lib/eet_data.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/lib/eet_data.c b/src/lib/eet_data.c index 42c181f..35512ca 100644 --- a/src/lib/eet_data.c +++ b/src/lib/eet_data.c @@ -21,6 +21,18 @@ #include "Eet.h" #include "Eet_private.h" +#ifdef _WIN32 +# define FMT_CHAR "%c" +# define FMT_UCHAR "%c" +# define FMT_LONG_LONG "%I64i" +# define FMT_ULONG_LONG "%I64u" +#else +# define FMT_CHAR "%hhi" +# define FMT_UCHAR "%hhu" +# define FMT_LONG_LONG "%lli" +# define FMT_ULONG_LONG "%llu" +#endif + /* * routines for doing data -> struct and struct -> data conversion * @@ -3016,7 +3028,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed, if (!strcmp(tok3, "char:")) { n->type = EET_T_CHAR; - sscanf(tok4, "%hhi", + sscanf(tok4, FMT_CHAR, &(n->data.value.c)); } else if (!strcmp(tok3, "short:")) @@ -3034,7 +3046,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed, else if (!strcmp(tok3, "long_long:")) { n->type = EET_T_LONG_LONG; - sscanf(tok4, "%lli", + sscanf(tok4, FMT_LONG_LONG, &(n->data.value.l)); } else if (!strcmp(tok3, "float:")) @@ -3052,7 +3064,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed, else if (!strcmp(tok3, "uchar:")) { n->type = EET_T_UCHAR; - sscanf(tok4, "%hhu", + sscanf(tok4, FMT_UCHAR, &(n->data.value.uc)); } else if (!strcmp(tok3, "ushort:")) @@ -3070,7 +3082,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed, else if (!strcmp(tok3, "ulong_long:")) { n->type = EET_T_ULONG_LONG; - sscanf(tok4, "%llu", + sscanf(tok4, FMT_ULONG_LONG, &(n->data.value.ul)); } else if (!strcmp(tok3, "string:")) |