|
473 | 473 | #include <math.h> // sqrtf, fabsf, fmodf, powf, cosf, sinf, floorf, ceilf
|
474 | 474 | #include <stdio.h> // vsnprintf, sscanf, printf
|
475 | 475 | #include <new> // new (ptr)
|
476 |
| -#if defined(_MSC_VER) || defined(__MINGW32__) |
477 |
| -#include <malloc.h> // alloca |
478 |
| -#else |
479 |
| -#include <alloca.h> // alloca |
480 |
| -#endif |
481 | 476 | #if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
|
482 | 477 | #include <stddef.h> // intptr_t
|
483 | 478 | #else
|
@@ -609,22 +604,22 @@ static bool InputIntN(const char* label, int* v, int components, ImG
|
609 | 604 | // Platform dependent default implementations
|
610 | 605 | //-----------------------------------------------------------------------------
|
611 | 606 |
|
612 |
| -static const char* GetClipboardTextFn_DefaultImpl(); |
613 |
| -static void SetClipboardTextFn_DefaultImpl(const char* text); |
614 |
| -static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y); |
| 607 | +static const char* GetClipboardTextFn_DefaultImpl(); |
| 608 | +static void SetClipboardTextFn_DefaultImpl(const char* text); |
| 609 | +static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y); |
615 | 610 |
|
616 | 611 | //-----------------------------------------------------------------------------
|
617 | 612 | // Context
|
618 | 613 | //-----------------------------------------------------------------------------
|
619 | 614 |
|
620 | 615 | // We access everything through this pointer (always assumed to be != NULL)
|
621 | 616 | // You can swap the pointer to a different context by calling ImGui::SetInternalState()
|
622 |
| -static ImGuiState GImDefaultState; |
623 |
| -ImGuiState* GImGui = &GImDefaultState; |
| 617 | +static ImGuiState GImDefaultState; |
| 618 | +ImGuiState* GImGui = &GImDefaultState; |
624 | 619 |
|
625 | 620 | // Statically allocated default font atlas. This is merely a maneuver to keep ImFontAtlas definition at the bottom of the .h file (otherwise it'd be inside ImGuiIO)
|
626 | 621 | // Also we wouldn't be able to new() one at this point, before users may define IO.MemAllocFn.
|
627 |
| -static ImFontAtlas GImDefaultFontAtlas; |
| 622 | +static ImFontAtlas GImDefaultFontAtlas; |
628 | 623 |
|
629 | 624 | //-----------------------------------------------------------------------------
|
630 | 625 | // User facing structures
|
|
0 commit comments