--- a/stage4/generate_c/generate_c.cc	Mon May 25 12:17:10 2009 +0200
+++ b/stage4/generate_c/generate_c.cc	Tue May 26 18:04:27 2009 +0200
@@ -73,8 +73,7 @@
 
 
 
-
-
+#if 0
 /* A symbol table with all globally declared functions... */
 function_declaration_c null_symbol1(NULL,NULL,NULL,NULL);
 dsymtable_c<function_declaration_c *, &null_symbol1> function_symtable;
@@ -93,8 +92,11 @@
  */
 symbol_c null_symbol4;
 symtable_c<symbol_c *, &null_symbol4> type_symtable;
-
-
+#else
+
+#include "../../search_utils/search_utils.hh"
+
+#endif
 
 /***********************************************************************/
 /***********************************************************************/
@@ -550,11 +552,6 @@
   generate_c_vardecl_c *vardecl;
   TRACE("function_declaration_c");
 
-  /* start off by adding this declaration to the global
-   * function declaration symbol table...
-   */
-  function_symtable.insert(symbol->derived_function_name, symbol);
-
   /* (A) Function declaration... */
   /* (A.1) Function return type */
   s4o.print("// FUNCTION\n");
@@ -673,11 +670,6 @@
   generate_c_typedecl_c *typedecl;
   TRACE("function_block_declaration_c");
 
-  /* start off by adding this declaration to the global
-   * function block declaration symbol table...
-   */
-  function_block_type_symtable.insert(symbol->fblock_name, symbol);
-  
   /* (A) Function Block data structure declaration... */
   typedecl = new generate_c_typedecl_c(&s4o_incl);
   /* (A.1) Data structure declaration */
@@ -873,11 +865,6 @@
   generate_c_typedecl_c *typedecl;
   TRACE("program_declaration_c");
 
-  /* start off by adding this declaration to the global
-   * program declaration symbol table...
-   */
-  program_type_symtable.insert(symbol->program_type_name, symbol);
-
   /* (A) Program data structure declaration... */
   typedecl = new generate_c_typedecl_c(&s4o_incl);
   /* (A.1) Data structure declaration */