diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-07-23 12:05:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-07-23 12:05:06 -0400 |
| commit | 3323615dd2bffa54970624bb6eb2465f4064d812 (patch) | |
| tree | e245e51db8c1a920dc7454beedc2e69cdbca4140 /src/ext | |
| parent | 3c2eefac2e9a1db1b7d318ece20426bd3cb2a14c (diff) | |
| download | tor-3323615dd2bffa54970624bb6eb2465f4064d812.tar.gz tor-3323615dd2bffa54970624bb6eb2465f4064d812.zip | |
Re-run trunnel to capture change for msvc.
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/trunnel/trunnel-impl.h | 4 | ||||
| -rw-r--r-- | src/ext/trunnel/trunnel.c | 2 | ||||
| -rw-r--r-- | src/ext/trunnel/trunnel.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index d98dc34fa2..ab790f86b0 100644 --- a/src/ext/trunnel/trunnel-impl.h +++ b/src/ext/trunnel/trunnel-impl.h @@ -1,4 +1,4 @@ -/* trunnel-impl.h -- copied from Trunnel v1.4.1 +/* trunnel-impl.h -- copied from Trunnel v1.4.2 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -18,7 +18,7 @@ #include "trunnel-local.h" #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER < 1600) #define uint8_t unsigned char #define uint16_t unsigned short #define uint32_t unsigned int diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index ce8db4d248..dc1c9fc2da 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -1,4 +1,4 @@ -/* trunnel.c -- copied from Trunnel v1.4.1 +/* trunnel.c -- copied from Trunnel v1.4.2 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h index 78da904f4f..776e2cff4e 100644 --- a/src/ext/trunnel/trunnel.h +++ b/src/ext/trunnel/trunnel.h @@ -1,4 +1,4 @@ -/* trunnel.h -- copied from Trunnel v1.4.1 +/* trunnel.h -- copied from Trunnel v1.4.2 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ |