diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_font.h | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index d1f569e3f16..33747eb35a3 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -31,6 +31,10 @@ #ifndef BKE_VFONT_H #define BKE_VFONT_H +#ifdef __cplusplus +extern "C" { +#endif + #include <wchar.h> struct VFont; @@ -65,7 +69,11 @@ int getselection(int *start, int *end); void chtoutf8(unsigned long c, char *o); void wcs2utf8s(char *dst, wchar_t *src); int wcsleninu8(wchar_t *src); -int utf8towchar_(wchar_t *w, char *c); +int utf8towchar(wchar_t *w, char *c); + +#ifdef __cplusplus +} +#endif #endif diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 4b4704d8ba8..09c93962990 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -179,7 +179,7 @@ only a single input character is consumed. */ -int utf8towchar_(wchar_t *w, char *c) +int utf8towchar(wchar_t *w, char *c) { int len=0; @@ -661,7 +661,7 @@ struct chartrans *text_to_curve(Object *ob, int mode) utf8len = utf8slen(cu->str); tmp = mem = MEM_callocN(((utf8len + 1) * sizeof(wchar_t)), "convertedmem"); - utf8towchar_(mem, cu->str); + utf8towchar(mem, cu->str); // Count the wchar_t string length slen = wcslen(mem); |