yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix806' of https://github.com/kolbma/stb into work2

Browse Source
This commit is contained in:
Sean Barrett 2020-02-02 09:45:35 -08:00
commit acd1c66aa4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -10,7 +10,7 @@ Noteworthy:
* image loader: [stb_image.h](stb_image.h) * image loader: [stb_image.h](stb_image.h)
* image writer: [stb_image_write.h](stb_image_write.h) * image writer: [stb_image_write.h](stb_image_write.h)
* image resizer: [stb_image_resize.h](stb_image_resize.h) * image resizer: [stb_image_resize.h](stb_image_resize.h)
* font text rasterizer: [stb_textedit.h](stb_textedit.h) * font text rasterizer: [stb_truetype.h](stb_truetype.h)
* typesafe containers: [stb_ds.h](stb_ds.h) * typesafe containers: [stb_ds.h](stb_ds.h)
Most libraries by stb, except: stb_dxt by Fabian "ryg" Giesen, stb_image_resize Most libraries by stb, except: stb_dxt by Fabian "ryg" Giesen, stb_image_resize

3
stb_sprintf.h
View File

@ -19,6 +19,7 @@
// Stefano Zanotti // Stefano Zanotti
// Adam Allison // Adam Allison
// Arvid Gerstmann // Arvid Gerstmann
// Markus Kolb
// //
// LICENSE: // LICENSE:
// //
@ -214,7 +215,7 @@ STBSP__PUBLICDEF void STB_SPRINTF_DECORATE(set_separators)(char comma, char peri
#define stbsp__uint16 unsigned short #define stbsp__uint16 unsigned short
#ifndef stbsp__uintptr #ifndef stbsp__uintptr
#if defined(__ppc64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) || defined(__x86_64) #if defined(__ppc64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) || defined(__x86_64)
#define stbsp__uintptr stbsp__uint64 #define stbsp__uintptr stbsp__uint64
#else #else
#define stbsp__uintptr stbsp__uint32 #define stbsp__uintptr stbsp__uint32