From 21f36c26398ef1907bc43e02f4a9c2b8da9872b0 Mon Sep 17 00:00:00 2001 From: "josh.macdonald" Date: Mon, 5 Nov 2012 06:53:57 +0000 Subject: Address issue 147 --- xdelta3/Makefile.am | 1 + xdelta3/xdelta3.h | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am index 23a3d39..da5b295 100644 --- a/xdelta3/Makefile.am +++ b/xdelta3/Makefile.am @@ -55,6 +55,7 @@ man1_MANS = xdelta3.1 EXTRA_DIST = \ draft-korn-vcdiff.txt \ + README \ examples/Makefile \ examples/README \ examples/checksum_test.cc \ diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h index 0710f08..6cffbf8 100644 --- a/xdelta3/xdelta3.h +++ b/xdelta3/xdelta3.h @@ -129,11 +129,16 @@ typedef unsigned int usize_t; #ifdef _MSC_VER #define inline typedef signed int ssize_t; +#if _MSC_VER < 1600 typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned long uint32_t; typedef ULONGLONG uint64_t; #else +/* For MSVC10 and above */ +#include +#endif +#else /* mingw32, lcc and watcom provide a proper header */ #include #endif -- cgit v1.2.3