diff options
| author | Austin Henriksen <austin@zeroc.com> | 2021-02-03 18:11:49 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-02-09 13:15:43 -0500 |
| commit | 24f320be8cfd21c1c5710e4590bb53561b72fdb5 (patch) | |
| tree | 2a8e52388c4f9e35a4d01b9f3075393b98986468 /cpp/src/IceGrid | |
| parent | Regenerated IceStorm scanner. (diff) | |
| download | ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.tar.bz2 ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.tar.xz ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.zip | |
Repaired VS project and solution files.
Diffstat (limited to 'cpp/src/IceGrid')
4 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index 23958d4a7c9..9413d50a829 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -471,6 +471,7 @@ using namespace IceGrid; # undef yywrap # define yywrap() 1 # endif +# define YY_NO_UNISTD_H #endif #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) diff --git a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj index 75df18d0cc6..f623b5763f7 100644 --- a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj index f33c1c1dc37..7d05d27eec4 100644 --- a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj index 9889b74db1c..7097a24b00e 100644 --- a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> |