[tor-commits] [trunnel/master] Fix an msvc issue reported by Gisle Vanem; bump copyright date

[nickm at torproject.org]

commit 1de832c66450867b4ed0ca5c5ade32e8ead3f6e6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 23 12:02:46 2015 -0400

    Fix an msvc issue reported by Gisle Vanem; bump copyright date
---
 lib/trunnel/data/trunnel-impl.h |    4 ++--
 lib/trunnel/data/trunnel.c      |    2 +-
 lib/trunnel/data/trunnel.h      |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/trunnel/data/trunnel-impl.h b/lib/trunnel/data/trunnel-impl.h
index 4dd710f..e6de363 100644
--- a/lib/trunnel/data/trunnel-impl.h
+++ b/lib/trunnel/data/trunnel-impl.h
@@ -1,7 +1,7 @@
 /* trunnel-impl.h -- Implementation helpers for trunnel, included by
  * generated trunnel files
  *
- * Copyright 2014, The Tor Project, Inc.
+ * Copyright 2014-2015, The Tor Project, Inc.
  * See license at the end of this file for copying information.
  */
 
@@ -14,7 +14,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/lib/trunnel/data/trunnel.c b/lib/trunnel/data/trunnel.c
index 4c56449..285a310 100644
--- a/lib/trunnel/data/trunnel.c
+++ b/lib/trunnel/data/trunnel.c
@@ -1,6 +1,6 @@
 /* trunnel.c -- Helper functions to implement trunnel.
  *
- * Copyright 2014, The Tor Project, Inc.
+ * Copyright 2014-2015, The Tor Project, Inc.
  * See license at the end of this file for copying information.
  *
  * See trunnel-impl.h for documentation of these functions.
diff --git a/lib/trunnel/data/trunnel.h b/lib/trunnel/data/trunnel.h
index 0a78e6c..2ee8629 100644
--- a/lib/trunnel/data/trunnel.h
+++ b/lib/trunnel/data/trunnel.h
@@ -1,7 +1,7 @@
 /* trunnel.h -- Public declarations for trunnel, to be included
  * in trunnel header files.
 
- * Copyright 2014, The Tor Project, Inc.
+ * Copyright 2014-2015, The Tor Project, Inc.
  * See license at the end of this file for copying information.
  */