Skip to content

Commit e32f093

Browse files
committed
Missing includes for imgui_draw.cpp (#219)
1 parent 52a7470 commit e32f093

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

imgui.cpp

+6-11
Original file line numberDiff line numberDiff line change
@@ -473,11 +473,6 @@
473473
#include <math.h> // sqrtf, fabsf, fmodf, powf, cosf, sinf, floorf, ceilf
474474
#include <stdio.h> // vsnprintf, sscanf, printf
475475
#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
481476
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
482477
#include <stddef.h> // intptr_t
483478
#else
@@ -609,22 +604,22 @@ static bool InputIntN(const char* label, int* v, int components, ImG
609604
// Platform dependent default implementations
610605
//-----------------------------------------------------------------------------
611606

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);
615610

616611
//-----------------------------------------------------------------------------
617612
// Context
618613
//-----------------------------------------------------------------------------
619614

620615
// We access everything through this pointer (always assumed to be != NULL)
621616
// 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;
624619

625620
// 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)
626621
// 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;
628623

629624
//-----------------------------------------------------------------------------
630625
// User facing structures

imgui_draw.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
#include "imgui_internal.h"
2020
#include <stdio.h> // vsnprintf, sscanf, printf
2121
#include <new> // new (ptr)
22+
#if defined(_MSC_VER) || defined(__MINGW32__)
23+
#include <malloc.h> // alloca
24+
#else
25+
#include <alloca.h> // alloca
26+
#endif
2227

2328
#ifdef _MSC_VER
2429
#pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff)

0 commit comments

Comments
 (0)