diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-01-03 08:31:53 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-01-03 09:26:49 +0000 |
commit | e55fefab06cfd791e3ac9f244fb85059ce20a5d5 (patch) | |
tree | e4bf088e9286a203e0c96c3d1d0535f1bda2868e /src/3rdparty/imgui/patches/0001-imgui-stb_truetype-Include-the-standard-string.h.patch | |
parent | 193fc20a277d9db81742348d01e02febbf448565 (diff) |
imgui/stb_truetype: Include the standard string.h
...instead of the non-standard memory.h
Also store the patch separately, as is the custom with 3rdparty stuff.
Change-Id: I641b3712e17613ffbceb5f0f060f4a757bf950cb
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/3rdparty/imgui/patches/0001-imgui-stb_truetype-Include-the-standard-string.h.patch')
-rw-r--r-- | src/3rdparty/imgui/patches/0001-imgui-stb_truetype-Include-the-standard-string.h.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/3rdparty/imgui/patches/0001-imgui-stb_truetype-Include-the-standard-string.h.patch b/src/3rdparty/imgui/patches/0001-imgui-stb_truetype-Include-the-standard-string.h.patch new file mode 100644 index 0000000..b4827c6 --- /dev/null +++ b/src/3rdparty/imgui/patches/0001-imgui-stb_truetype-Include-the-standard-string.h.patch @@ -0,0 +1,28 @@ +From 57e7e85ac6909f8898b68f82d44521082b37db0d Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs <laszlo.agocs@qt.io> +Date: Wed, 3 Jan 2018 08:31:53 +0100 +Subject: [PATCH] imgui/stb_truetype: Include the standard string.h + +...instead of the non-standard memory.h + +Change-Id: I641b3712e17613ffbceb5f0f060f4a757bf950cb +--- + src/3rdparty/imgui/stb_truetype.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/imgui/stb_truetype.h b/src/3rdparty/imgui/stb_truetype.h +index 92b9a87..e59481e 100644 +--- a/src/3rdparty/imgui/stb_truetype.h ++++ b/src/3rdparty/imgui/stb_truetype.h +@@ -431,7 +431,7 @@ int main(int arg, char **argv) + #endif + + #ifndef STBTT_memcpy +- #include <memory.h> ++ #include <string.h> + #define STBTT_memcpy memcpy + #define STBTT_memset memset + #endif +-- +2.9.3.windows.2 + |