From bde07831104e9ffa5cea092c242e7b5662987244 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 12 Dec 2001 11:51:53 +0000 Subject: include config.h so the definition of MINI_XFTCONFIG_DIR is actually used 2001-12-12 Sven Neumann * pango/mini-xft/minixftinit.c: include config.h so the definition of MINI_XFTCONFIG_DIR is actually used (spotted by Sebastian Klemke ). --- ChangeLog | 6 ++++++ ChangeLog.pre-1-0 | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-2 | 6 ++++++ ChangeLog.pre-1-4 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/mini-xft/minixftinit.c | 6 ++++-- 8 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c53fc41..b1ab917f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-12-12 Sven Neumann + + * pango/mini-xft/minixftinit.c: include config.h so the definition + of MINI_XFTCONFIG_DIR is actually used (spotted by Sebastian Klemke + ). + 2001-12-12 Alexander Larsson * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_fontset): diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 8c53fc41..b1ab917f 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +2001-12-12 Sven Neumann + + * pango/mini-xft/minixftinit.c: include config.h so the definition + of MINI_XFTCONFIG_DIR is actually used (spotted by Sebastian Klemke + ). + 2001-12-12 Alexander Larsson * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_fontset): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8c53fc41..b1ab917f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2001-12-12 Sven Neumann + + * pango/mini-xft/minixftinit.c: include config.h so the definition + of MINI_XFTCONFIG_DIR is actually used (spotted by Sebastian Klemke + ). + 2001-12-12 Alexander Larsson * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_fontset): diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 8c53fc41..b1ab917f 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +2001-12-12 Sven Neumann + + * pango/mini-xft/minixftinit.c: include config.h so the definition + of MINI_XFTCONFIG_DIR is actually used (spotted by Sebastian Klemke + ). + 2001-12-12 Alexander Larsson * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_fontset): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 8c53fc41..b1ab917f 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +2001-12-12 Sven Neumann + + * pango/mini-xft/minixftinit.c: include config.h so the definition + of MINI_XFTCONFIG_DIR is actually used (spotted by Sebastian Klemke + ). + 2001-12-12 Alexander Larsson * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_fontset): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 8c53fc41..b1ab917f 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +2001-12-12 Sven Neumann + + * pango/mini-xft/minixftinit.c: include config.h so the definition + of MINI_XFTCONFIG_DIR is actually used (spotted by Sebastian Klemke + ). + 2001-12-12 Alexander Larsson * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_fontset): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 8c53fc41..b1ab917f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +2001-12-12 Sven Neumann + + * pango/mini-xft/minixftinit.c: include config.h so the definition + of MINI_XFTCONFIG_DIR is actually used (spotted by Sebastian Klemke + ). + 2001-12-12 Alexander Larsson * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_fontset): diff --git a/pango/mini-xft/minixftinit.c b/pango/mini-xft/minixftinit.c index c055ed34..b24b5c69 100644 --- a/pango/mini-xft/minixftinit.c +++ b/pango/mini-xft/minixftinit.c @@ -22,6 +22,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" + #include #include @@ -29,7 +31,7 @@ #include "minixftint.h" MiniXftFontSet *_MiniXftFontSet; -Bool _MiniXftConfigInitialized; +Bool _MiniXftConfigInitialized; Bool MiniXftInit (char *config) @@ -83,7 +85,7 @@ mini_xft_get_default_path (void) "..", NULL); - for (i = 0; i < (sizeof(paths) / sizeof(paths[0])); i++) + for (i = 0; i < G_N_ELEMENTS (paths); i++) { if (result) g_free (result); -- cgit v1.2.1