diff options
| author | Tor Lillqvist <tml@iki.fi> | 2004-12-12 21:52:09 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2004-12-12 21:52:09 +0000 |
| commit | f84e23d20b29d406ab1f183f22ab4b9ca42b46fb (patch) | |
| tree | 7feb79de1ffcc5a596fbf16892f632458159149c | |
| parent | 93b027c3788b3bc71fb841b743b32c3717aa4398 (diff) | |
| download | pango-f84e23d20b29d406ab1f183f22ab4b9ca42b46fb.tar.gz | |
pango/modules.c (read_modules) Use gstdio wrappers. (#16111, Robert
2004-12-12 Tor Lillqvist <tml@iki.fi>
* pango/modules.c (read_modules)
* pango/pango-utils.c (read_alias_file,read_config_file): Use
gstdio wrappers. (#16111, Robert Ögren)
* pango/pangoft2-fontmap.c: Remove unneded includes of <dirent.h>
and <windows.h>.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | pango/modules.c | 3 | ||||
| -rw-r--r-- | pango/pango-utils.c | 6 | ||||
| -rw-r--r-- | pango/pangoft2-fontmap.c | 8 |
6 files changed, 33 insertions, 11 deletions
@@ -1,3 +1,12 @@ +2004-12-12 Tor Lillqvist <tml@iki.fi> + + * pango/modules.c (read_modules) + * pango/pango-utils.c (read_alias_file,read_config_file): Use + gstdio wrappers. (#16111, Robert Ögren) + + * pango/pangoft2-fontmap.c: Remove unneded includes of <dirent.h> + and <windows.h>. + Fri Dec 10 16:30:40 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-render.c (draw_glyph): Fix problem diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c0773e14..68b8b6fc 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +2004-12-12 Tor Lillqvist <tml@iki.fi> + + * pango/modules.c (read_modules) + * pango/pango-utils.c (read_alias_file,read_config_file): Use + gstdio wrappers. (#16111, Robert Ögren) + + * pango/pangoft2-fontmap.c: Remove unneded includes of <dirent.h> + and <windows.h>. + Fri Dec 10 16:30:40 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-render.c (draw_glyph): Fix problem diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c0773e14..68b8b6fc 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +2004-12-12 Tor Lillqvist <tml@iki.fi> + + * pango/modules.c (read_modules) + * pango/pango-utils.c (read_alias_file,read_config_file): Use + gstdio wrappers. (#16111, Robert Ögren) + + * pango/pangoft2-fontmap.c: Remove unneded includes of <dirent.h> + and <windows.h>. + Fri Dec 10 16:30:40 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-render.c (draw_glyph): Fix problem diff --git a/pango/modules.c b/pango/modules.c index ceb4f2d5..719ec66e 100644 --- a/pango/modules.c +++ b/pango/modules.c @@ -26,6 +26,7 @@ #include <errno.h> #include <gmodule.h> +#include <glib/gstdio.h> #include "pango-enum-types.h" #include "pango-modules.h" @@ -494,7 +495,7 @@ read_modules (void) while (n-- > 0) { - module_file = fopen (files[n], "r"); + module_file = g_fopen (files[n], "r"); if (module_file) { process_module_file(module_file); diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 2c9e18d4..c30c88d3 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -29,6 +29,8 @@ #include "pango-font.h" #include "pango-utils.h" +#include <glib/gstdio.h> + #ifdef HAVE_FRIBIDI #include <fribidi/fribidi.h> #endif @@ -459,7 +461,7 @@ read_config_file (const char *filename, gboolean enoent_error) char *section = NULL; int line = 0; - file = fopen (filename, "r"); + file = g_fopen (filename, "r"); if (!file) { if (errno != ENOENT || enoent_error) @@ -1485,7 +1487,7 @@ read_alias_file (const char *filename) int n_new; int i; - file = fopen (filename, "r"); + file = g_fopen (filename, "r"); if (!file) return; diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 43607b07..0302caf7 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -27,9 +27,6 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif #include <fontconfig/fontconfig.h> @@ -37,11 +34,6 @@ #include "pangoft2-private.h" #include "pangofc-fontmap.h" -#ifdef G_OS_WIN32 -#define STRICT -#include <windows.h> -#endif - typedef struct _PangoFT2Family PangoFT2Family; typedef struct _PangoFT2FontMapClass PangoFT2FontMapClass; |