From 2986932f31b6c0760411b71973754597dca7af32 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Tue, 20 Jan 2015 02:09:59 +0100 Subject: [PATCH] Fix issues with type_name on Win64 build Both size_t and unsigned long long are aliases for unsigned __int64 on Win64, and causes a duplicate definition. Replacing all the integer type_name definitions with stdint.h names should avoid this problem. --- libaegisub/include/libaegisub/type_name.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libaegisub/include/libaegisub/type_name.h b/libaegisub/include/libaegisub/type_name.h index 666b0074e..25754bf1f 100644 --- a/libaegisub/include/libaegisub/type_name.h +++ b/libaegisub/include/libaegisub/type_name.h @@ -28,11 +28,12 @@ AGI_DEFINE_TYPE_NAME(bool); AGI_DEFINE_TYPE_NAME(char); AGI_DEFINE_TYPE_NAME(double); AGI_DEFINE_TYPE_NAME(float); -AGI_DEFINE_TYPE_NAME(int); -AGI_DEFINE_TYPE_NAME(long long); -AGI_DEFINE_TYPE_NAME(long); -AGI_DEFINE_TYPE_NAME(size_t); -AGI_DEFINE_TYPE_NAME(unsigned long long); +AGI_DEFINE_TYPE_NAME(int16_t); +AGI_DEFINE_TYPE_NAME(int32_t); +AGI_DEFINE_TYPE_NAME(int64_t); +AGI_DEFINE_TYPE_NAME(uint16_t); +AGI_DEFINE_TYPE_NAME(uint32_t); +AGI_DEFINE_TYPE_NAME(uint64_t); AGI_DEFINE_TYPE_NAME(void); #undef AGI_TYPE_NAME_PRIMITIVE