Skip to content

Commit bb2435a

Browse files
committed
Minor align with upstream
1 parent d2e63e0 commit bb2435a

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

src/common/sokol.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
/* sokol implementations need to live in it's own source file, because
2-
on MacOS and iOS the implementation must be compiled as Objective-C, so there
3-
must be a *.m file on MacOS/iOS, and *.c file everywhere else
4-
*/
51
#define SOKOL_IMPL
62
#define SOKOL_TRACE_HOOKS
7-
/* sokol 3D-API defines are provided by build options */
3+
// sokol 3D-API defines are provided by build options
84
#include "sokol_app.h"
95
#include "sokol_gfx.h"
106
#include "sokol_time.h"

src/ui/ui_memedit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,14 +830,14 @@ struct MemoryEditor
830830
// FIXME: This technically depends on ImGuiDataType order.
831831
const char* DataTypeGetDesc(ImGuiDataType data_type) const
832832
{
833-
const char* descs[] = { "Int8", "Uint8", "Int16", "Uint16", "Int32", "Uint32", "Int64", "Uint64", "Float", "Double" };
833+
const char* descs[ImGuiDataType_COUNT] = { "Int8", "Uint8", "Int16", "Uint16", "Int32", "Uint32", "Int64", "Uint64", "Float", "Double" };
834834
IM_ASSERT(data_type >= 0 && data_type < IM_ARRAYSIZE(descs));
835835
return descs[data_type];
836836
}
837837

838838
size_t DataTypeGetSize(ImGuiDataType data_type) const
839839
{
840-
const size_t sizes[] = { 1, 1, 2, 2, 4, 4, 8, 8, sizeof(float), sizeof(double) };
840+
const size_t sizes[ImGuiDataType_COUNT] = { 1, 1, 2, 2, 4, 4, 8, 8, sizeof(float), sizeof(double) };
841841
IM_ASSERT(data_type >= 0 && data_type < IM_ARRAYSIZE(sizes));
842842
return sizes[data_type];
843843
}

0 commit comments

Comments
 (0)