diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-08-19 12:14:52 +0200 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2015-08-24 10:32:50 +0100 |
| commit | db3f7ffe32808fde89ce7696066c0b1276756703 (patch) | |
| tree | 4945d22f62bcd475cf54605b7ad6515e6ae5f50e /source/fitz/time.c | |
| parent | 697f6a7cc3eb4230fcf0825b23125c54cbbe412b (diff) | |
| download | mupdf-db3f7ffe32808fde89ce7696066c0b1276756703.tar.xz | |
Revert revert of WinMain utf-8 handling and fix the bugs.
Also fix a few ifdefs in time.c so that it builds on MinGW.
Diffstat (limited to 'source/fitz/time.c')
| -rw-r--r-- | source/fitz/time.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/fitz/time.c b/source/fitz/time.c index 6b1d6255..1f45e665 100644 --- a/source/fitz/time.c +++ b/source/fitz/time.c @@ -1,10 +1,11 @@ -#ifdef _MSC_VER +#ifdef _WIN32 #include "mupdf/fitz.h" #include <time.h> #include <windows.h> +#ifdef _MSC_VER #ifndef _WINRT #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 @@ -33,6 +34,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz) } #endif /* !_WINRT */ +#endif /* _MSC_VER */ char * fz_utf8_from_wchar(const wchar_t *s) @@ -138,4 +140,4 @@ fz_free_argv(int argc, char **argv) free(argv); } -#endif /* _MSC_VER */ +#endif /* _WIN32 */ |