summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjosh.macdonald <jmacd@users.noreply.github.com>2012-11-05 06:53:57 +0000
committerjosh.macdonald <jmacd@users.noreply.github.com>2012-11-05 06:53:57 +0000
commit21f36c26398ef1907bc43e02f4a9c2b8da9872b0 (patch)
tree7b6a4b0cc8c879668f205ca51685735d2298993a
parenta9e8d2f03a29f81ecb490980d64431f25296085d (diff)
Address issue 147
-rw-r--r--xdelta3/Makefile.am1
-rw-r--r--xdelta3/xdelta3.h5
2 files changed, 6 insertions, 0 deletions
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
55 55
56EXTRA_DIST = \ 56EXTRA_DIST = \
57 draft-korn-vcdiff.txt \ 57 draft-korn-vcdiff.txt \
58 README \
58 examples/Makefile \ 59 examples/Makefile \
59 examples/README \ 60 examples/README \
60 examples/checksum_test.cc \ 61 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;
129#ifdef _MSC_VER 129#ifdef _MSC_VER
130#define inline 130#define inline
131typedef signed int ssize_t; 131typedef signed int ssize_t;
132#if _MSC_VER < 1600
132typedef unsigned char uint8_t; 133typedef unsigned char uint8_t;
133typedef unsigned short uint16_t; 134typedef unsigned short uint16_t;
134typedef unsigned long uint32_t; 135typedef unsigned long uint32_t;
135typedef ULONGLONG uint64_t; 136typedef ULONGLONG uint64_t;
136#else 137#else
138/* For MSVC10 and above */
139#include <stdint.h>
140#endif
141#else
137/* mingw32, lcc and watcom provide a proper header */ 142/* mingw32, lcc and watcom provide a proper header */
138#include <stdint.h> 143#include <stdint.h>
139#endif 144#endif