Skip to content

Commit 1cc9fa9

Browse files
committed
ifdef around my stb macro
1 parent 1126fd7 commit 1cc9fa9

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

nuklear.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5685,10 +5685,12 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
56855685
#define STB_TRUETYPE_IMPLEMENTATION
56865686
#endif
56875687

5688+
#ifndef STBTT_malloc
56885689
static nk_handle fictional_handle = {0};
56895690

56905691
#define STBTT_malloc(x,u) nk_malloc( fictional_handle, 0, x )
56915692
#define STBTT_free(x,u) nk_mfree( fictional_handle , x)
5693+
#endif
56925694

56935695
#endif /* NK_NUKLEAR_H_ */
56945696

src/nuklear.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5466,9 +5466,11 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
54665466
#define STB_TRUETYPE_IMPLEMENTATION
54675467
#endif
54685468

5469+
#ifndef STBTT_malloc
54695470
static nk_handle fictional_handle = {0};
54705471

54715472
#define STBTT_malloc(x,u) nk_malloc( fictional_handle, 0, x )
54725473
#define STBTT_free(x,u) nk_mfree( fictional_handle , x)
5474+
#endif
54735475

54745476
#endif /* NK_NUKLEAR_H_ */

0 commit comments

Comments
 (0)