diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-01-24 15:16:56 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-01-24 15:16:56 -0600 |
| commit | b22b7b729d2d617c49381843362bc3ef336d66ec (patch) | |
| tree | 2a6ddbcee95ca474bb0228ea8d7bece6524eecd0 /qemu-common.h | |
| parent | 4a2ba232843ac4197c586c1f0f0adbb1eb02fe34 (diff) | |
| parent | a5c062edd272a222179c2bbf54c539c992aefc93 (diff) | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'qemu-common.h')
| -rw-r--r-- | qemu-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-common.h b/qemu-common.h index c766b990eb..c351131623 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -158,8 +158,8 @@ int fcntl_setfl(int fd, int flag); #define STRTOSZ_DEFSUFFIX_MB 'M' #define STRTOSZ_DEFSUFFIX_KB 'K' #define STRTOSZ_DEFSUFFIX_B 'B' -ssize_t strtosz(const char *nptr, char **end); -ssize_t strtosz_suffix(const char *nptr, char **end, const char default_suffix); +int64_t strtosz(const char *nptr, char **end); +int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix); /* path.c */ void init_paths(const char *prefix); |