diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-04-04 16:35:59 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-16 19:25:38 +0100 |
| commit | 0de3169c52435458583955ac03fc57516d5d372e (patch) | |
| tree | d865fc044d54ab13540bce95f95398004e5f6f40 /fitz | |
| parent | 6bb186c3d057a1ec129d801fcf6893d378c5e12d (diff) | |
| download | mupdf-0de3169c52435458583955ac03fc57516d5d372e.tar.xz | |
Fix for merge of golden commits as well as initial attempt at html viewing. Issues exist though in the
xaml WebView object used in the windows UI.
Diffstat (limited to 'fitz')
| -rw-r--r-- | fitz/base_time.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/fitz/base_time.c b/fitz/base_time.c index 8bdd6977..c0d6a8c0 100644 --- a/fitz/base_time.c +++ b/fitz/base_time.c @@ -1,4 +1,4 @@ -#if defined(_WIN32) && !defined(_WINRT) +#if defined(_WIN32) #include <time.h> #ifndef METRO @@ -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); |