From 5d0a207ecb843c4c73be897cfccbf3a0d2db574b Mon Sep 17 00:00:00 2001 From: Chris Want Date: Wed, 16 Apr 2008 22:40:48 +0000 Subject: Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats! --- source/blender/blenkernel/BKE_font.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source/blender/blenkernel/BKE_font.h') diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index 05621a4d9b2..d1f569e3f16 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -3,15 +3,12 @@ * * $Id$ * - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -29,7 +26,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ #ifndef BKE_VFONT_H #define BKE_VFONT_H -- cgit v1.2.3 From bc18e9e2908cad1d416c101f9aa07c29fdaed7c0 Mon Sep 17 00:00:00 2001 From: Ken Hughes Date: Fri, 25 Apr 2008 19:18:24 +0000 Subject: Suggestion by GSR; move "extern C" into header file, remove "_" from utf8towchar function name. --- source/blender/blenkernel/BKE_font.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_font.h') 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 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 -- cgit v1.2.3