From: Thadeu Lima de Souza Cascardo <cascardo@dcc.ufmg.br>
Date: Sun, 2 Oct 2005 19:09:20 +0000 (+0000)
Subject: Conflict symbols are now static
X-Git-Tag: cascardo@tlscascardo--private,libgrammatic--lr1--0.1--base-0
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fgrammar.git;a=commitdiff_plain;h=64421e638353137fdab10c37cf9b055e93dbf112

Conflict symbols are now static

When linking first and item, a symbol conflict for the function for
getting a list from the keys in a hash. They are static now, which solves
the problem.


git-archimport-id: cascardo@tlscascardo--private/libgrammatic--dev--0.1--patch-18
---

diff --git a/first.c b/first.c
index cd3f524..e3af868 100644
--- a/first.c
+++ b/first.c
@@ -474,7 +474,7 @@ GHashTable* grammar_first (Grammar* grammar)
   return first;
 }
 
-void put_key_on_list (gpointer key, gpointer val, gpointer data)
+static void put_key_on_list (gpointer key, gpointer val, gpointer data)
 {
   GList** l;
   l = (GList**) data;
diff --git a/item.c b/item.c
index 1d7a9e4..9c05e06 100644
--- a/item.c
+++ b/item.c
@@ -109,7 +109,7 @@ gboolean item_set_add (GHashTable* item_set, item_t* item)
   return FALSE;
 }
 
-void put_key_on_list (gpointer key, gpointer val, gpointer data)
+static void put_key_on_list (gpointer key, gpointer val, gpointer data)
 {
   GList** l;
   l = (GList**) data;