DPF

commit 7f206b99dcccadbf26376ea6db0b9557800dd97d
parent 01af6735cccfa25ce2d0f9c449900975a273176f
Author: falkTX <falktx@falktx.com>
Date:   Fri,  7 Jan 2022 18:02:29 +0000

Fix previous commit, upstream is slightly borked

Signed-off-by: falkTX <falktx@falktx.com>

Diffstat:
M
dgl/src/nanovg/fontstash.h
 | 
10
++++------

1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/dgl/src/nanovg/fontstash.h b/dgl/src/nanovg/fontstash.h
@@ -160,7 +160,10 @@ typedef struct FONSttFontImpl FONSttFontImpl;
 #else
 
 #define STB_TRUETYPE_IMPLEMENTATION
-
+static void* fons__tmpalloc(size_t size, void* up);
+static void fons__tmpfree(void* ptr, void* up);
+#define STBTT_malloc(x,u)    fons__tmpalloc(x,u)
+#define STBTT_free(x,u)      fons__tmpfree(x,u)
 #include "stb_truetype.h"
 
 struct FONSttFontImpl {
@@ -405,11 +408,6 @@ int fons__tt_getGlyphKernAdvance(FONSttFontImpl *font, int glyph1, int glyph2)
 
 #else
 
-static void* fons__tmpalloc(size_t size, void* up);
-static void fons__tmpfree(void* ptr, void* up);
-#define STBTT_malloc(x,u)    fons__tmpalloc(x,u)
-#define STBTT_free(x,u)      fons__tmpfree(x,u)
-
 int fons__tt_init(FONScontext *context)
 {
 	FONS_NOTUSED(context);