diff options
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/pch.h | 7 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/base/files.h | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h index a6a442f0a..bdc13aedf 100644 --- a/toolsrc/include/pch.h +++ b/toolsrc/include/pch.h @@ -31,7 +31,7 @@ #include <cstdint> #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING #include <cstring> -#if USE_STD_FILESYSTEM +#if VCPKG_USE_STD_FILESYSTEM #include <filesystem> #else #include <experimental/filesystem> @@ -54,7 +54,12 @@ #else #include <sys/time.h> #endif + #include <sys/types.h> +// glibc defines major and minor in sys/types.h, and should not +#undef major +#undef minor + #include <system_error> #include <thread> #include <time.h> diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index 3b92feabe..0bad428c0 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -3,7 +3,7 @@ #include <vcpkg/base/expected.h> #include <vcpkg/base/ignore_errors.h> -#if USE_STD_FILESYSTEM +#if VCPKG_USE_STD_FILESYSTEM #include <filesystem> #else #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING @@ -12,7 +12,7 @@ namespace fs { -#if USE_STD_FILESYSTEM +#if VCPKG_USE_STD_FILESYSTEM namespace stdfs = std::filesystem; #else namespace stdfs = std::experimental::filesystem; |