From 56c21d108cded7a6d66e113c4196679e483e031a Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Mon, 31 Aug 2015 09:47:59 -1000 Subject: [PATCH] Added inttypes --- hecl/blender/BlenderConnection.cpp | 9 +++++---- hecl/extern/Athena | 2 +- hecl/extern/LogVisor | 2 +- hecl/include/HECL/HECL.hpp | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hecl/blender/BlenderConnection.cpp b/hecl/blender/BlenderConnection.cpp index fd0be6665..10568c7fa 100644 --- a/hecl/blender/BlenderConnection.cpp +++ b/hecl/blender/BlenderConnection.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -182,11 +183,11 @@ BlenderConnection::BlenderConnection(bool silenceBlender) wchar_t cmdLine[2048]; if (installAttempt == 1) - _snwprintf(cmdLine, 2048, L" --background -P \"%s\" -- %d %d \"%s\"", - blenderShellPath.c_str(), int(writehandle), int(readhandle), blenderAddonPath.c_str()); + _snwprintf(cmdLine, 2048, L" --background -P \"%s\" -- %" PRIuPTR " %" PRIuPTR " \"%s\"", + blenderShellPath.c_str(), uintptr_t(writehandle), uintptr_t(readhandle), blenderAddonPath.c_str()); else - _snwprintf(cmdLine, 2048, L" --background -P \"%s\" -- %d %d", - blenderShellPath.c_str(), int(writehandle), int(readhandle)); + _snwprintf(cmdLine, 2048, L" --background -P \"%s\" -- %" PRIuPTR " %" PRIuPTR, + blenderShellPath.c_str(), uintptr_t(writehandle), uintptr_t(readhandle)); STARTUPINFO sinfo = {sizeof(STARTUPINFO)}; HANDLE nulHandle = NULL; diff --git a/hecl/extern/Athena b/hecl/extern/Athena index 9c44d5f4d..fd55c9298 160000 --- a/hecl/extern/Athena +++ b/hecl/extern/Athena @@ -1 +1 @@ -Subproject commit 9c44d5f4de48e661855b883672dd56491acbe3e5 +Subproject commit fd55c9298330d0809b5d2c7dc4277f87c6d29c19 diff --git a/hecl/extern/LogVisor b/hecl/extern/LogVisor index 828db515b..317e75c22 160000 --- a/hecl/extern/LogVisor +++ b/hecl/extern/LogVisor @@ -1 +1 @@ -Subproject commit 828db515ba316903c367b9dc7acf9d0bec0969e7 +Subproject commit 317e75c22e31746947bd1b3700cd72d53c97c837 diff --git a/hecl/include/HECL/HECL.hpp b/hecl/include/HECL/HECL.hpp index af0aa2742..a10467ea2 100644 --- a/hecl/include/HECL/HECL.hpp +++ b/hecl/include/HECL/HECL.hpp @@ -18,6 +18,7 @@ #include "winsupport.hpp" #endif +#include #include #include #include