Commit 7f01a804 authored by Adrian Johnson's avatar Adrian Johnson

Use _WIN32 to check for windows, not WIN32

These should have been fixed in #24259 but must have been missed.
parent e38ffea6
......@@ -423,7 +423,7 @@ GBool openTempFile(GooString **name, FILE **f, const char *mode) {
#endif
}
#ifdef WIN32
#ifdef _WIN32
GooString *fileNameToUTF8(char *path) {
GooString *s;
char *p;
......@@ -462,7 +462,7 @@ GooString *fileNameToUTF8(wchar_t *path) {
#endif
FILE *openFile(const char *path, const char *mode) {
#ifdef WIN32
#ifdef _WIN32
OSVERSIONINFO version;
wchar_t wPath[_MAX_PATH + 1];
char nPath[_MAX_PATH + 1];
......
......@@ -105,7 +105,7 @@ extern time_t getModTime(char *fileName);
// should be "w" or "wb". Returns true on success.
extern GBool openTempFile(GooString **name, FILE **f, const char *mode);
#ifdef WIN32
#ifdef _WIN32
// Convert a file name from Latin-1 to UTF-8.
extern GooString *fileNameToUTF8(char *path);
......
......@@ -253,7 +253,7 @@ public:
~SysFontList();
SysFontInfo *find(GooString *name, GBool isFixedWidth, GBool exact);
#ifdef WIN32
#ifdef _WIN32
void scanWindowsFonts(GooString *winFontDir);
#endif
#ifdef WITH_FONTCONFIGURATION_FONTCONFIG
......@@ -261,7 +261,7 @@ public:
#endif
private:
#ifdef WIN32
#ifdef _WIN32
SysFontInfo *makeWindowsFont(char *name, int fontNum,
char *path);
#endif
......
......@@ -64,7 +64,7 @@ static inline int splashFloor(SplashCoord x) {
: "=m" (oldCW), "=m" (newCW), "=m" (result), "=r" (t)
: "m" (x));
return result;
#elif defined(WIN32) && defined(_M_IX86)
#elif defined(_WIN32) && defined(_M_IX86)
// floor() and (int)() are implemented separately, which results
// in changing the FPCW multiple times - so we optimize it with
// some inline assembly
......@@ -111,7 +111,7 @@ static inline int splashCeil(SplashCoord x) {
: "=m" (oldCW), "=m" (newCW), "=m" (result), "=r" (t)
: "m" (x));
return result;
#elif defined(WIN32) && defined(_M_IX86)
#elif defined(_WIN32) && defined(_M_IX86)
// ceil() and (int)() are implemented separately, which results
// in changing the FPCW multiple times - so we optimize it with
// some inline assembly
......@@ -156,7 +156,7 @@ static inline int splashRound(SplashCoord x) {
: "=m" (oldCW), "=m" (newCW), "=m" (result), "=r" (t)
: "m" (x));
return result;
#elif defined(WIN32) && defined(_M_IX86)
#elif defined(_WIN32) && defined(_M_IX86)
// this could use round-to-nearest mode and avoid the "+0.5",
// but that produces slightly different results (because i+0.5
// sometimes rounds up and sometimes down using the even rule)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment