diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-05-16 19:26:27 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-16 19:26:27 +0100 |
| commit | 0451cf6d814f172f6370b46553865c66d0933c14 (patch) | |
| tree | 9a571ef5495c955b6de7bc2f3e29124163100e56 /fitz | |
| parent | 5157d7cac960316e76ac408d1f6ec1d24867bdb7 (diff) | |
| parent | 4a7e2298fff3a1972fda5c537a8c5e7c6d8f8292 (diff) | |
| download | mupdf-0451cf6d814f172f6370b46553865c66d0933c14.tar.xz | |
Merge branch 'winRT2'
Diffstat (limited to 'fitz')
| -rw-r--r-- | fitz/base_time.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fitz/base_time.c b/fitz/base_time.c index 01877a30..3b625ec0 100644 --- a/fitz/base_time.c +++ b/fitz/base_time.c @@ -13,6 +13,12 @@ #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL #endif +#if defined(_WINRT) + +void fz_gettimeofday_dummy() { } + +#else + struct timeval; int gettimeofday(struct timeval *tv, struct timezone *tz) @@ -38,6 +44,8 @@ int gettimeofday(struct timeval *tv, struct timezone *tz) return 0; } +#endif + FILE *fopen_utf8(const char *name, const char *mode) { wchar_t *wname, *wmode, *d; @@ -45,7 +53,7 @@ FILE *fopen_utf8(const char *name, const char *mode) int c; FILE *file; - d = wname = malloc((strlen(name)+1) * sizeof(wchar_t)); + d = wname = (wchar_t*) malloc((strlen(name)+1) * sizeof(wchar_t)); if (d == NULL) return NULL; s = name; @@ -54,7 +62,7 @@ FILE *fopen_utf8(const char *name, const char *mode) *d++ = c; } *d = 0; - d = wmode = malloc((strlen(mode)+1) * sizeof(wchar_t)); + d = wmode = (wchar_t*) malloc((strlen(mode)+1) * sizeof(wchar_t)); if (d == NULL) { free(wname); |