Fix C++ breakage introduced in cset 290f0d28f8fc.

2 files changed, 4 insertions, 5 deletions

diff --git a/include/xine.h.in b/include/xine.h.in
index 58507e6f1..c25aef4b1 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -1536,8 +1536,7 @@ void xine_config_update_entry (xine_t *self,
  * translation of old configuration entry names
  */
 typedef struct {
-  const char *old;
-  const char *new;
+  const char *old_name, *new_name;
 } xine_config_entry_translation_t;
 
 void xine_config_set_translation_user (const xine_config_entry_translation_t *) XINE_PROTECTED;
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 67c8ef909..cc3f21db8 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -353,9 +353,9 @@ static void config_remove(config_values_t *this, cfg_entry_t *entry, cfg_entry_t
 static const char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans)
 {
   --trans;
-  while ((++trans)->old)
-    if (trans->new[0] && strcmp(key, trans->old) == 0)
-      return trans->new;
+  while ((++trans)->old_name)
+    if (trans->new_name[0] && strcmp(key, trans->old_name) == 0)
+      return trans->new_name;
   return NULL;
 }