Browse code

Add XDP-related files to the Windows project and fix the Windows build.

Shawn Webb authored on 2014/08/05 01:57:43
Showing 3 changed files
... ...
@@ -38,7 +38,9 @@
38 38
 
39 39
 #include <stdio.h>
40 40
 #include <stdlib.h>
41
+#if !defined(_WIN32)
41 42
 #include <unistd.h>
43
+#endif
42 44
 #include <errno.h>
43 45
 #include "xar.h"
44 46
 #include "fmap.h"
... ...
@@ -81,7 +83,7 @@ char *dump_xdp(cli_ctx *ctx, const char *start, size_t sz)
81 81
         nwritten += writeret;
82 82
     }
83 83
 
84
-    cli_dbgmsg("%s: Dumped payload to %s\n", __func__, filename);
84
+    cli_dbgmsg("dump_xdp: Dumped payload to %s\n", filename);
85 85
 
86 86
     return filename;
87 87
 }
... ...
@@ -410,6 +410,7 @@
410 410
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
411 411
     </ClCompile>
412 412
     <ClCompile Include="..\libclamav\www.c" />
413
+    <ClCompile Include="..\libclamav\xdp.c" />
413 414
     <ClCompile Include="..\libclamav\xz_iface.c" />
414 415
     <ClCompile Include="..\libclamav\yc.c" />
415 416
     <ClCompile Include="..\shared\getopt.c" />
... ...
@@ -510,6 +511,7 @@
510 510
     <ClInclude Include="..\libclamav\stats_json.h" />
511 511
     <ClInclude Include="..\libclamav\stats.h" />
512 512
     <ClInclude Include="..\libclamav\www.h" />
513
+    <ClInclude Include="..\libclamav\xdp.h" />
513 514
   </ItemGroup>
514 515
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
515 516
   <ImportGroup Label="ExtensionTargets">
... ...
@@ -518,4 +520,4 @@
518 518
     <Library Include="libeay32.lib" />
519 519
     <Library Include="ssleay32.lib" />
520 520
   </ItemGroup>
521
-</Project>
521
+</Project>
522 522
\ No newline at end of file
... ...
@@ -909,6 +909,9 @@
909 909
     <ClCompile Include="..\libclamav\pdfng.c">
910 910
       <Filter>Source Files</Filter>
911 911
     </ClCompile>
912
+    <ClCompile Include="..\libclamav\xdp.c">
913
+      <Filter>Source Files</Filter>
914
+    </ClCompile>
912 915
   </ItemGroup>
913 916
   <ItemGroup>
914 917
     <ClInclude Include="..\libclamav\hostid.h">
... ...
@@ -926,9 +929,12 @@
926 926
     <ClInclude Include="..\libclamav\conv.h">
927 927
       <Filter>Source Files</Filter>
928 928
     </ClInclude>
929
+    <ClInclude Include="..\libclamav\xdp.h">
930
+      <Filter>Source Files</Filter>
931
+    </ClInclude>
929 932
   </ItemGroup>
930 933
   <ItemGroup>
931 934
     <Library Include="libeay32.lib" />
932 935
     <Library Include="ssleay32.lib" />
933 936
   </ItemGroup>
934
-</Project>
937
+</Project>
935 938
\ No newline at end of file