summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3.h
diff options
context:
space:
mode:
authorJoshua MacDonald <jmacd@users.noreply.github.com>2017-08-21 00:10:12 -0700
committerGitHub <noreply@github.com>2017-08-21 00:10:12 -0700
commitb1af688beeb5cc6579fb01e1e8e3c5e3ed83fc2d (patch)
treef394ef7c1445ccf9a1ea24a52afeb799be19f4c4 /xdelta3/xdelta3.h
parent13b7c970bc494d0e7dd293b55a3fcd097190854d (diff)
parent9a2ba806a4c8ef6192fd911963f8106d40336ef3 (diff)
Merge pull request #231 from lieser/vs2013
Update VS project to VS2013
Diffstat (limited to 'xdelta3/xdelta3.h')
-rw-r--r--xdelta3/xdelta3.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index f98eb2a..b9b6fe0 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -136,6 +136,7 @@
136/* _MSV_VER is defined by Microsoft tools, not by Mingw32 */ 136/* _MSV_VER is defined by Microsoft tools, not by Mingw32 */
137#ifdef _MSC_VER 137#ifdef _MSC_VER
138typedef signed int ssize_t; 138typedef signed int ssize_t;
139typedef int pid_t;
139#if _MSC_VER < 1600 140#if _MSC_VER < 1600
140typedef unsigned char uint8_t; 141typedef unsigned char uint8_t;
141typedef unsigned short uint16_t; 142typedef unsigned short uint16_t;
@@ -144,6 +145,7 @@ typedef ULONGLONG uint64_t;
144#else /* _MSC_VER >= 1600 */ 145#else /* _MSC_VER >= 1600 */
145/* For MSVC10 and above */ 146/* For MSVC10 and above */
146#include <stdint.h> 147#include <stdint.h>
148#define inline __inline
147#endif /* _MSC_VER < 1600 */ 149#endif /* _MSC_VER < 1600 */
148#else /* _MSC_VER not defined */ 150#else /* _MSC_VER not defined */
149/* Mingw32 */ 151/* Mingw32 */
@@ -165,6 +167,9 @@ typedef ULONGLONG uint64_t;
165#define _FILE_OFFSET_BITS 64 167#define _FILE_OFFSET_BITS 64
166#endif 168#endif
167 169
170static_assert(SIZEOF_SIZE_T == sizeof(size_t), "SIZEOF_SIZE_T not correctly set");
171static_assert(SIZEOF_UNSIGNED_LONG_LONG == sizeof(unsigned long long), "SIZEOF_UNSIGNED_LONG_LONG not correctly set");
172
168/* Set a xoff_t typedef and the "Q" printf insert. */ 173/* Set a xoff_t typedef and the "Q" printf insert. */
169#if defined(_WIN32) 174#if defined(_WIN32)
170typedef uint64_t xoff_t; 175typedef uint64_t xoff_t;