diff options
| author | Havoc Pennington <hp@pobox.com> | 2001-02-21 04:09:17 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-02-21 04:09:17 +0000 |
| commit | 51df27fae443be766b686da2759617af3c1d7193 (patch) | |
| tree | 8dddd932bdd0bc2131ecea5e92666f490dd9ffe4 /pango | |
| parent | a7e7e50eea273f1b7f50da041bea1a53782b06f8 (diff) | |
| download | pango-51df27fae443be766b686da2759617af3c1d7193.tar.gz | |
Patch from Soeren Sandmann
2001-02-20 Havoc Pennington <hp@pobox.com>
Patch from Soeren Sandmann
* pango/pangox-fontcache.c (pango_x_font_cache_load): make xlfd
arg const
* pango/pango-utils.c (pango_get_sysconf_subdirectory):
G_CONST_RETURN
(pango_get_lib_subdirectory): G_CONST_RETURN
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-utils.c | 4 | ||||
| -rw-r--r-- | pango/pango-utils.h | 4 | ||||
| -rw-r--r-- | pango/pangox-fontcache.c | 2 | ||||
| -rw-r--r-- | pango/pangox.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pango/pango-utils.c b/pango/pango-utils.c index eb8e2c31..f0a5aafd 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -616,7 +616,7 @@ pango_config_key_get (const char *key) return g_strdup (g_hash_table_lookup (config_hash, key)); } -char * +G_CONST_RETURN char * pango_get_sysconf_subdirectory (void) { #ifdef G_OS_WIN32 @@ -632,7 +632,7 @@ pango_get_sysconf_subdirectory (void) #endif } -char * +G_CONST_RETURN char * pango_get_lib_subdirectory (void) { #ifdef G_OS_WIN32 diff --git a/pango/pango-utils.h b/pango/pango-utils.h index bac20699..f688070e 100644 --- a/pango/pango-utils.h +++ b/pango/pango-utils.h @@ -65,13 +65,13 @@ gboolean pango_parse_stretch (const char *str, * stored in the registry). The returned string should not be * g_free'd. */ -char * pango_get_sysconf_subdirectory (void); +G_CONST_RETURN char * pango_get_sysconf_subdirectory (void); /* Ditto for LIBDIR/pango. On Win32, use the same Pango * installation directory. This returned string should not be * g_free'd either. */ -char * pango_get_lib_subdirectory (void); +G_CONST_RETURN char * pango_get_lib_subdirectory (void); /* A couple of routines from fribidi that we either wrap or diff --git a/pango/pangox-fontcache.c b/pango/pangox-fontcache.c index 14b17a70..ff606f03 100644 --- a/pango/pangox-fontcache.c +++ b/pango/pangox-fontcache.c @@ -138,7 +138,7 @@ cache_entry_unref (PangoXFontCache *cache, CacheEntry *entry) **/ XFontStruct * pango_x_font_cache_load (PangoXFontCache *cache, - char *xlfd) + const char *xlfd) { CacheEntry *entry; diff --git a/pango/pangox.h b/pango/pangox.h index 85dedbe4..a56fda91 100644 --- a/pango/pangox.h +++ b/pango/pangox.h @@ -92,7 +92,7 @@ PangoXFontCache *pango_x_font_cache_new (Display *display); void pango_x_font_cache_free (PangoXFontCache *cache); XFontStruct * pango_x_font_cache_load (PangoXFontCache *cache, - char *xlfd); + const char *xlfd); void pango_x_font_cache_unload (PangoXFontCache *cache, XFontStruct *fs); |