diff options
| author | martin-s <webmaster@macside.net> | 2017-11-05 19:13:16 +0100 |
|---|---|---|
| committer | martin-s <webmaster@macside.net> | 2017-11-05 19:13:16 +0100 |
| commit | d5a7da6bcb92b551d6f8a9a321deb063f6632dbc (patch) | |
| tree | 9dfef57f1fb3611bde577cab7b9dee9411ffb041 /ports/antlr4/static.patch | |
| parent | c6d69fac625706c52fc8e48615bc0c6d7b8dad25 (diff) | |
| parent | 330b8d8bab6a3d07165bf7c05fea09a8e0d56348 (diff) | |
| download | vcpkg-d5a7da6bcb92b551d6f8a9a321deb063f6632dbc.tar.gz vcpkg-d5a7da6bcb92b551d6f8a9a321deb063f6632dbc.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013
# Conflicts:
# scripts/cmake/vcpkg_configure_cmake.cmake
# toolsrc/src/vcpkg/vcpkgpaths.cpp
Diffstat (limited to 'ports/antlr4/static.patch')
| -rw-r--r-- | ports/antlr4/static.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ports/antlr4/static.patch b/ports/antlr4/static.patch index fb54c5ae4..e66787233 100644 --- a/ports/antlr4/static.patch +++ b/ports/antlr4/static.patch @@ -1,12 +1,12 @@ diff --git a/antlr4-common.h b/antlr4-common.h -index 197fd6d..34a62c8 100644 +index ce45e9e..3162795 100644 --- a/antlr4-common.h +++ b/antlr4-common.h -@@ -34,6 +34,7 @@ - #include <bitset> - #include <condition_variable> +@@ -48,6 +48,7 @@ + #endif -+#define ANTLR4CPP_STATIC - // Defines for the Guid class and other platform dependent stuff. - #ifdef _WIN32 - #pragma warning (disable: 4250) // Class inherits by dominance. + #define GUID_WINDOWS ++ #define ANTLR4CPP_STATIC + + #ifdef _WIN64 + typedef __int64 ssize_t; |