diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-05-21 10:36:47 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-05-21 11:23:34 +0000 |
| commit | 3e8c9a4c1a02be1f0d478ca2336c677ee2ce36a3 (patch) | |
| tree | 472baef97a76908fab970e281f6951d88830b5e1 /epan/nghttp2 | |
| parent | 353e4a3b3cb738d60523ab56316ceeb40804da76 (diff) | |
Include stdint.h instead of inttypes.h when compiled with MSVC < 2013
Backport by Alexis La Goutte from upstream
Bug:11216
Change-Id: Ia269adce607ebc5a31ac9ef119dc2d4248173d62
Reviewed-on: https://code.wireshark.org/review/8568
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/nghttp2')
| -rw-r--r-- | epan/nghttp2/nghttp2.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/epan/nghttp2/nghttp2.h b/epan/nghttp2/nghttp2.h index 29f85cd4e0..9f6e1f6fa1 100644 --- a/epan/nghttp2/nghttp2.h +++ b/epan/nghttp2/nghttp2.h @@ -38,7 +38,14 @@ extern "C" { #endif #include <stdlib.h> +#if defined(_MSC_VER) && (_MSC_VER < 1800) +/* MSVC < 2013 does not have inttypes.h because it is not C99 + compliant. See compiler macros and version number in + https://sourceforge.net/p/predef/wiki/Compilers/ */ +#include <stdint.h> +#else /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */ #include <inttypes.h> +#endif /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */ #include <sys/types.h> #include "nghttp2ver.h" |