Skip to content

Commit 78dfda9

Browse files
author
郑树新
committed
build ok on windows
1 parent f496ab0 commit 78dfda9

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

‎acl_cpp_vc2019.sln

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gson", "app\gson\gson_vc201
163163
EndProject
164164
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_tools", "app\net_tools\net_tools_vc2019.vcxproj", "{45276293-D169-4D73-8930-F255C09DA976}"
165165
EndProject
166+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_builder", "app\redis_tools\redis_builder\redis_builder_vc2019.vcxproj", "{D90DCF51-E219-4BD8-A032-076335675F58}"
167+
EndProject
166168
Global
167169
GlobalSection(SolutionConfigurationPlatforms) = preSolution
168170
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -861,6 +863,36 @@ Global
861863
{45276293-D169-4D73-8930-F255C09DA976}.Template|Win32.Build.0 = DebugDll|Win32
862864
{45276293-D169-4D73-8930-F255C09DA976}.Template|x64.ActiveCfg = DebugDll|Win32
863865
{45276293-D169-4D73-8930-F255C09DA976}.Template|x64.Build.0 = DebugDll|Win32
866+
{D90DCF51-E219-4BD8-A032-076335675F58}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
867+
{D90DCF51-E219-4BD8-A032-076335675F58}.Debug|Mixed Platforms.Build.0 = Debug|Win32
868+
{D90DCF51-E219-4BD8-A032-076335675F58}.Debug|Win32.ActiveCfg = Debug|Win32
869+
{D90DCF51-E219-4BD8-A032-076335675F58}.Debug|Win32.Build.0 = Debug|Win32
870+
{D90DCF51-E219-4BD8-A032-076335675F58}.Debug|x64.ActiveCfg = Debug|x64
871+
{D90DCF51-E219-4BD8-A032-076335675F58}.Debug|x64.Build.0 = Debug|x64
872+
{D90DCF51-E219-4BD8-A032-076335675F58}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32
873+
{D90DCF51-E219-4BD8-A032-076335675F58}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32
874+
{D90DCF51-E219-4BD8-A032-076335675F58}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
875+
{D90DCF51-E219-4BD8-A032-076335675F58}.DebugDll|Win32.Build.0 = DebugDll|Win32
876+
{D90DCF51-E219-4BD8-A032-076335675F58}.DebugDll|x64.ActiveCfg = DebugDll|x64
877+
{D90DCF51-E219-4BD8-A032-076335675F58}.DebugDll|x64.Build.0 = DebugDll|x64
878+
{D90DCF51-E219-4BD8-A032-076335675F58}.Release|Mixed Platforms.ActiveCfg = Release|Win32
879+
{D90DCF51-E219-4BD8-A032-076335675F58}.Release|Mixed Platforms.Build.0 = Release|Win32
880+
{D90DCF51-E219-4BD8-A032-076335675F58}.Release|Win32.ActiveCfg = Release|Win32
881+
{D90DCF51-E219-4BD8-A032-076335675F58}.Release|Win32.Build.0 = Release|Win32
882+
{D90DCF51-E219-4BD8-A032-076335675F58}.Release|x64.ActiveCfg = Release|x64
883+
{D90DCF51-E219-4BD8-A032-076335675F58}.Release|x64.Build.0 = Release|x64
884+
{D90DCF51-E219-4BD8-A032-076335675F58}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
885+
{D90DCF51-E219-4BD8-A032-076335675F58}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32
886+
{D90DCF51-E219-4BD8-A032-076335675F58}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32
887+
{D90DCF51-E219-4BD8-A032-076335675F58}.Releasedll|Win32.Build.0 = ReleaseDll|Win32
888+
{D90DCF51-E219-4BD8-A032-076335675F58}.Releasedll|x64.ActiveCfg = ReleaseDll|x64
889+
{D90DCF51-E219-4BD8-A032-076335675F58}.Releasedll|x64.Build.0 = ReleaseDll|x64
890+
{D90DCF51-E219-4BD8-A032-076335675F58}.Template|Mixed Platforms.ActiveCfg = Debug|Win32
891+
{D90DCF51-E219-4BD8-A032-076335675F58}.Template|Mixed Platforms.Build.0 = Debug|Win32
892+
{D90DCF51-E219-4BD8-A032-076335675F58}.Template|Win32.ActiveCfg = Debug|Win32
893+
{D90DCF51-E219-4BD8-A032-076335675F58}.Template|Win32.Build.0 = Debug|Win32
894+
{D90DCF51-E219-4BD8-A032-076335675F58}.Template|x64.ActiveCfg = Debug|x64
895+
{D90DCF51-E219-4BD8-A032-076335675F58}.Template|x64.Build.0 = Debug|x64
864896
EndGlobalSection
865897
GlobalSection(SolutionProperties) = preSolution
866898
HideSolutionNode = FALSE
@@ -898,6 +930,7 @@ Global
898930
{84376B60-FF20-4FD0-967E-C568FC2FBC53} = {30B69273-9D47-4AD6-B1C5-CF362F9C6D80}
899931
{D15D860E-5012-471A-83D4-81A1251BF88D} = {30B69273-9D47-4AD6-B1C5-CF362F9C6D80}
900932
{45276293-D169-4D73-8930-F255C09DA976} = {30B69273-9D47-4AD6-B1C5-CF362F9C6D80}
933+
{D90DCF51-E219-4BD8-A032-076335675F58} = {30B69273-9D47-4AD6-B1C5-CF362F9C6D80}
901934
EndGlobalSection
902935
GlobalSection(ExtensibilityGlobals) = postSolution
903936
SolutionGuid = {40FA3A5B-123F-4EC0-9EEB-8A9C17BF573B}

‎lib_acl/src/stdlib/acl_vstring.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ static void mmap_buf_init(ACL_VSTRING *vp, size_t offset)
313313
vp->vbuf.data = (unsigned char *) MapViewOfFile(vp->vbuf.hmap,
314314
FILE_MAP_READ | FILE_MAP_WRITE, dwFileOffsetHigh,
315315
dwFileOffsetLow, 0);
316-
if (vp->vbuf.data == NULL) {}
316+
if (vp->vbuf.data == NULL) {
317317
acl_msg_fatal("MapViewOfFile error: %s", acl_last_serror());
318318
}
319319
#else

0 commit comments

Comments
 (0)