mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 15:28:22 +08:00
44 lines
1.1 KiB
Diff
44 lines
1.1 KiB
Diff
|
From 2fffeb273ea46c1e91536f3d660982de785c8d49 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Long Nguyen <nguyen.long.908132@gmail.com>
|
||
|
|
Date: Sat, 8 May 2021 20:52:59 +0700
|
||
|
|
Subject: [PATCH 03/14] Fix WIN32 macro checks
|
||
|
|
|
||
|
|
---
|
||
|
|
src/file.h | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/file.h b/src/file.h
|
||
|
|
index 299ac0c..2c365a6 100644
|
||
|
|
--- a/src/file.h
|
||
|
|
+++ b/src/file.h
|
||
|
|
@@ -82,7 +82,7 @@
|
||
|
|
#include <tre/regex.h>
|
||
|
|
#include <time.h>
|
||
|
|
#include <sys/types.h>
|
||
|
|
-#ifndef WIN32
|
||
|
|
+#ifndef _WIN32
|
||
|
|
#include <sys/param.h>
|
||
|
|
#endif
|
||
|
|
/* Do this here and now, because struct stat gets re-defined on solaris */
|
||
|
|
@@ -95,7 +95,7 @@
|
||
|
|
#define MAGIC "/etc/magic"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if defined(__EMX__) || defined (WIN32)
|
||
|
|
+#if defined(__EMX__) || defined (_WIN32)
|
||
|
|
#define PATHSEP ';'
|
||
|
|
#else
|
||
|
|
#define PATHSEP ':'
|
||
|
|
@@ -103,7 +103,7 @@
|
||
|
|
|
||
|
|
#define private static
|
||
|
|
|
||
|
|
-#if HAVE_VISIBILITY && !defined(WIN32)
|
||
|
|
+#if HAVE_VISIBILITY && !defined(_WIN32)
|
||
|
|
#define public __attribute__ ((__visibility__("default")))
|
||
|
|
#ifndef protected
|
||
|
|
#define protected __attribute__ ((__visibility__("hidden")))
|
||
|
|
--
|
||
|
|
2.29.2.windows.2
|
||
|
|
|