diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-10 00:18:00 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-10 00:18:00 -0400 |
| commit | 24a06ed38135679efe65e3a6cf844c64cd04f79e (patch) | |
| tree | d737fbd9e895a696d13967204efecd22da22eb24 /scheduler | |
| parent | 19dc16f764492eb3b1cf7c57b7f645e214cb9b3a (diff) | |
| download | cups-24a06ed38135679efe65e3a6cf844c64cd04f79e.tar.gz | |
Migrate Windows conditional code to _WIN32 define.
Diffstat (limited to 'scheduler')
| -rw-r--r-- | scheduler/cupsd.h | 4 | ||||
| -rw-r--r-- | scheduler/type.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index c0174fae7..bc1350e7e 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -27,11 +27,11 @@ #include <sys/stat.h> #include <sys/wait.h> -#ifdef WIN32 +#ifdef _WIN32 # include <direct.h> #else # include <unistd.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ #include "mime.h" diff --git a/scheduler/type.c b/scheduler/type.c index 195437414..719afb7df 100644 --- a/scheduler/type.c +++ b/scheduler/type.c @@ -1083,7 +1083,7 @@ mime_check_rules( break; case MIME_MAGIC_LOCALE : -#if defined(WIN32) || defined(__EMX__) || defined(__APPLE__) +#if defined(_WIN32) || defined(__EMX__) || defined(__APPLE__) result = !strcmp(rules->value.localev, setlocale(LC_ALL, "")); #else result = !strcmp(rules->value.localev, setlocale(LC_MESSAGES, "")); |