From a5739a0aa30f35271213157b994a0fcb0cd773b9 Mon Sep 17 00:00:00 2001 From: omar Date: Sat, 23 Dec 2017 15:19:48 +0100 Subject: [PATCH] Fixed warning with Clang+MSVC using __int64 to define the helper ImU64 type (#1184) --- imgui.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgui.h b/imgui.h index a644337dc..de9177c94 100644 --- a/imgui.h +++ b/imgui.h @@ -92,7 +92,7 @@ typedef int ImGuiTreeNodeFlags; // flags: for TreeNode*(),CollapsingHeader() typedef int ImGuiWindowFlags; // flags: for Begin*() // enum ImGuiWindowFlags_ typedef int (*ImGuiTextEditCallback)(ImGuiTextEditCallbackData *data); typedef void (*ImGuiSizeConstraintCallback)(ImGuiSizeConstraintCallbackData* data); -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) typedef unsigned __int64 ImU64; // 64-bit unsigned integer #else typedef unsigned long long ImU64; // 64-bit unsigned integer