mirror of
https://gitee.com/acl-dev/acl.git
synced 2024-12-02 11:57:43 +08:00
Merge branch 'gitee-upstream-master' into gitee-master
This commit is contained in:
commit
6fa0208953
@ -43,7 +43,7 @@ typedef struct ACL_RFC1035_MESSAGE {
|
||||
unsigned int tc:1; /* Response: Specifies that this message was truncated */
|
||||
unsigned int rd:1; /* Query->Response: Recursion Desired, optional */
|
||||
unsigned int ra:1; /* Response: Recursion Available */
|
||||
unsigned int z:4; /* Reserved for future use */
|
||||
unsigned int z:3; /* Reserved for future use */
|
||||
unsigned int rcode:4; /* Response code:
|
||||
* 0: No error condition
|
||||
* 1: Query format error
|
||||
|
@ -870,4 +870,4 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
@ -610,9 +610,6 @@
|
||||
<ClCompile Include="src\serialize\gsoner.cpp">
|
||||
<Filter>Source Files\serialize</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\net\rfc1035.cpp">
|
||||
<Filter>Source Files\net</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\mqtt\mqtt_ack.cpp">
|
||||
<Filter>Source Files\mqtt</Filter>
|
||||
</ClCompile>
|
||||
@ -670,6 +667,9 @@
|
||||
<ClCompile Include="src\mqtt\mqtt_unsubscribe.cpp">
|
||||
<Filter>Source Files\mqtt</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\net\rfc1035.cpp">
|
||||
<Filter>Source Files\net</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\acl_stdafx.hpp">
|
||||
@ -1521,6 +1521,9 @@
|
||||
<Filter Include="Header Files\mqtt">
|
||||
<UniqueIdentifier>{b1614f78-4c4d-476b-a687-fsdfsfsfsfsf}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\net">
|
||||
<UniqueIdentifier>{086b502e-edc5-4694-916e-64392b5d03e8}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="todo.txt">
|
||||
@ -1530,4 +1533,4 @@
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="lib_acl_cpp_vc2019.rc" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
Loading…
Reference in New Issue
Block a user