summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--src/psnames/psmodule.c11
2 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 33b02ff2a..4b4e14e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-18 David Turner <david@freetype.org>
+
+ * src/psnames/psmodule.c: using 'static' to make declarations
+ non-global for ft_wgl_extra_unicodes, ft_wgl_extra_glyph_names,
+ ft_wgl_extra_glyph_name_offsets, ps_check_wgl_name and
+ ps_check_wgl_unicode
+
+
+
2008-05-17 Sam Hocevar <samh>
* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Handle zero-contour
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c
index 7f5a10365..dbcfe44b1 100644
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -184,7 +184,7 @@
#define WGL_EXTRA_LIST_SIZE 8
- const FT_UInt32 ft_wgl_extra_unicodes[WGL_EXTRA_LIST_SIZE] =
+ static const FT_UInt32 ft_wgl_extra_unicodes[WGL_EXTRA_LIST_SIZE] =
{
0x0394,
0x03A9,
@@ -196,7 +196,7 @@
0x00A0
};
- const char ft_wgl_extra_glyph_names[] =
+ static const char ft_wgl_extra_glyph_names[] =
{
'D','e','l','t','a',0,
'O','m','e','g','a',0,
@@ -208,7 +208,8 @@
's','p','a','c','e',0
};
- const FT_Int ft_wgl_extra_glyph_name_offsets[WGL_EXTRA_LIST_SIZE] =
+ static const FT_Int
+ ft_wgl_extra_glyph_name_offsets[WGL_EXTRA_LIST_SIZE] =
{
0,
6,
@@ -221,7 +222,7 @@
};
- void
+ static void
ps_check_wgl_name( const char* gname,
FT_UInt glyph,
FT_UInt* wgl_glyphs,
@@ -248,7 +249,7 @@
}
- void
+ static void
ps_check_wgl_unicode( FT_UInt32 uni_char,
FT_UInt *states )
{