diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-05-16 22:02:09 +0200 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-16 23:47:13 +0100 |
| commit | 558ad511446cfa1d70891d9e7c9fb1ba942d3d9a (patch) | |
| tree | 0556cc3769bf0f3b9a003958fdcf47820bfbc33e | |
| parent | c97b4b45e272b45be9c8670623c3075a069aa328 (diff) | |
| download | mupdf-558ad511446cfa1d70891d9e7c9fb1ba942d3d9a.tar.xz | |
Reorder #ifdef's in base_time.c
| -rw-r--r-- | fitz/base_time.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/fitz/base_time.c b/fitz/base_time.c index 3b625ec0..1b600399 100644 --- a/fitz/base_time.c +++ b/fitz/base_time.c @@ -1,11 +1,11 @@ -#ifdef _WIN32 - #include <time.h> +#include "fitz.h" + +#ifdef _WIN32 #ifndef METRO #include <winsock2.h> #endif #include <windows.h> -#include "fitz.h" #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 @@ -13,11 +13,7 @@ #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL #endif -#if defined(_WINRT) - -void fz_gettimeofday_dummy() { } - -#else +#ifndef _WINRT struct timeval; @@ -44,7 +40,11 @@ int gettimeofday(struct timeval *tv, struct timezone *tz) return 0; } -#endif +#else /* !_WINRT */ + +void fz_gettimeofday_dummy() { } + +#endif /* !_WINRT) */ FILE *fopen_utf8(const char *name, const char *mode) { @@ -80,8 +80,4 @@ FILE *fopen_utf8(const char *name, const char *mode) return file; } -#else - -void fz_gettimeofday_dummy() { } - -#endif +#endif /* _WIN32 */ |