From f8532617857c7d1cd368dbc0bfb0f18d45cffda6 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 28 Apr 2011 10:22:14 -0500 Subject: [PATCH] apparently visual studio 2010's stdint.h isn't all it's cracked up to be. --- src/CMakeLists.txt | 2 +- src/events.h | 7 +++++-- src/wiiuse.h | 7 +++++-- src/wiiuse_internal.h | 7 +++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37cb30f..e3681cd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,7 @@ else() list(APPEND SOURCES io_nix.c) endif() -if(MSVC AND MSVC_VERSION LESS 1600) +if(MSVC) list(APPEND API wiiuse_msvcstdint.h) endif() diff --git a/src/events.h b/src/events.h index aa27b22..4363bcd 100644 --- a/src/events.h +++ b/src/events.h @@ -37,8 +37,11 @@ #ifndef EVENTS_H_INCLUDED #define EVENTS_H_INCLUDED -#if defined(_MSC_VER) && (_MSC_VER < 1600) -/* MS compilers of pre-VC2010 versions don't have stdint.h */ +#if defined(_MSC_VER) +/* MS compilers of pre-VC2010 versions don't have stdint.h + * and I can't get VC2010's stdint.h to compile nicely in + * WiiUse + */ #include "wiiuse_msvcstdint.h" #else #include diff --git a/src/wiiuse.h b/src/wiiuse.h index 76e4d57..ff0189a 100644 --- a/src/wiiuse.h +++ b/src/wiiuse.h @@ -76,8 +76,11 @@ #define WCONST const #endif -#if defined(_MSC_VER) && (_MSC_VER < 1600) -/* MS compilers of pre-VC2010 versions don't have stdint.h */ +#if defined(_MSC_VER) +/* MS compilers of pre-VC2010 versions don't have stdint.h + * and I can't get VC2010's stdint.h to compile nicely in + * WiiUse + */ #include "wiiuse_msvcstdint.h" #else #include diff --git a/src/wiiuse_internal.h b/src/wiiuse_internal.h index 2e57dea..de25bf0 100644 --- a/src/wiiuse_internal.h +++ b/src/wiiuse_internal.h @@ -53,8 +53,11 @@ #include "definitions.h" -#if defined(_MSC_VER) && (_MSC_VER < 1600) -/* MS compilers of pre-VC2010 versions don't have stdint.h */ +#if defined(_MSC_VER) +/* MS compilers of pre-VC2010 versions don't have stdint.h + * and I can't get VC2010's stdint.h to compile nicely in + * WiiUse + */ #include "wiiuse_msvcstdint.h" #else #include