summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Udaltsov <svu@gnome.org>2008-04-27 14:43:26 +0000
committerSergey Udaltsov <svu@gnome.org>2008-04-27 14:43:26 +0000
commit38d272aad87cb50f7d645c8b97733996434726ad (patch)
tree49190bdcb69bad9c4c9ea74d008958c5e85d6ca1
parentb7546f0a6f28260ab32087131c404c13ec3c2d52 (diff)
downloadlibxklavier-38d272aad87cb50f7d645c8b97733996434726ad.tar.gz
C99 fix
-rw-r--r--ChangeLog1
-rw-r--r--libxklavier/xklavier_config_iso.c10
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c5530dd..4dff280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* libxklavier/xkl_config_item.h, libxklavier/xkl_config_registry.h,
doc/reference: a bit of cleanup for gtkdoc
* NEWS: preparing 3.6
+ * libxklavier/xklavier_config_iso.c: C99 fix
2008-04-26 svu
diff --git a/libxklavier/xklavier_config_iso.c b/libxklavier/xklavier_config_iso.c
index 07cb94e..7721329 100644
--- a/libxklavier/xklavier_config_iso.c
+++ b/libxklavier/xklavier_config_iso.c
@@ -37,7 +37,7 @@ static GHashTable *lang_code_names = NULL;
typedef struct {
const gchar *domain;
- const gchar *attr_names[];
+ const gchar **attr_names;
} LookupParams;
typedef struct {
@@ -46,9 +46,11 @@ typedef struct {
LookupParams *params;
} CodeBuildStruct;
-static LookupParams countryLookup = { "iso_3166", {"alpha_2_code", NULL} };
-static LookupParams languageLookup =
- { "iso_639", {"iso_639_2B_code", "iso_639_2T_code", NULL} };
+static const char *countryLookupNames[] = { "alpha_2_code", NULL };
+static const char *languageLookupNames[] = { "iso_639_2B_code", "iso_639_2T_code", NULL };
+
+static LookupParams countryLookup = { "iso_3166", countryLookupNames };
+static LookupParams languageLookup = { "iso_639", languageLookupNames };
static void
iso_codes_parse_start_tag(GMarkupParseContext * ctx,