Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-12 02:00:58 +01:00
Code Releases Wiki Activity

Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. (#1917, #1319, #276)

Browse Source
This commit is contained in:
omar 2018-07-01 12:25:37 +02:00
parent c4e34aaace
commit 645ab6633c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.txt
View File

@ -40,6 +40,7 @@ Other Changes:
- Window: Allow menu windows from ignoring the style.WindowMinSize values so short menus are not padded. (#1909) - Window: Allow menu windows from ignoring the style.WindowMinSize values so short menus are not padded. (#1909)
- Misc: Added ImGuiMouseCursor_Hand cursor enum + corresponding software cursor. (#1913, 1914) [@aiekick, @ocornut] - Misc: Added ImGuiMouseCursor_Hand cursor enum + corresponding software cursor. (#1913, 1914) [@aiekick, @ocornut]
- Misc: Tweaked software mouse cursor offset to match the offset of the corresponding Windows 10 cursors. - Misc: Tweaked software mouse cursor offset to match the offset of the corresponding Windows 10 cursors.
- Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. (#1917, #1319, #276)
- Examples: Win32, Glfw, SDL: Added support for the ImGuiMouseCursor_Hand cursor. - Examples: Win32, Glfw, SDL: Added support for the ImGuiMouseCursor_Hand cursor.
----------------------------------------------------------------------- -----------------------------------------------------------------------

6
imgui_draw.cpp
View File

@ -19,13 +19,13 @@
#include <stdio.h> // vsnprintf, sscanf, printf #include <stdio.h> // vsnprintf, sscanf, printf
#if !defined(alloca) #if !defined(alloca)
#ifdef _WIN32 #if defined(__GLIBC__) || defined(__sun) || defined(__CYGWIN__)
#include <alloca.h> // alloca (glibc uses <alloca.h>. Note that Cygwin may have _WIN32 defined, so the order matters here)
#elif defined(_WIN32)
#include <malloc.h> // alloca #include <malloc.h> // alloca
#if !defined(alloca) #if !defined(alloca)
#define alloca _alloca // for clang with MS Codegen #define alloca _alloca // for clang with MS Codegen
#endif #endif
#elif defined(__GLIBC__) || defined(__sun)
#include <alloca.h> // alloca
#else #else
#include <stdlib.h> // alloca #include <stdlib.h> // alloca
#endif #endif