static const objects must have default constructors, so don't use const
here. Don't use extern inside functions when the declared function is
not in the same namespace.


(joerg)

$NetBSD: patch-backend_wbprivate_workbench_wb__context.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $

--- backend/wbprivate/workbench/wb_context.cpp.orig	2012-12-25 15:17:54.000000000 +0000
+++ backend/wbprivate/workbench/wb_context.cpp
@@ -128,6 +128,8 @@ ENABLE_LOG("wbprivate")
 #define HAVE_BUNDLED_MYSQLDUMP
 #endif
 
+void register_all_metaclasses();
+
 using namespace grt;
 using namespace bec;
 using namespace wb;
@@ -194,7 +196,6 @@ WBContext::WBContext(WBContextUI *ui, bo
   : _asked_for_saving(false), _uicontext(ui), _model_context(0), _sqlide_context(ui), _file(0),
     _save_point(0), _tunnel_manager(0)
 { 
-  extern void register_all_metaclasses();
   static bool registered_metaclasses= false;
 
   g_log_set_handler(NULL, (GLogLevelFlags)0xfffff, log_func, this);

$NetBSD: patch-backend_wbpublic_sqlide_sqlide__generics.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $

--- backend/wbpublic/sqlide/sqlide_generics.cpp.orig	2012-12-25 14:37:05.000000000 +0000
+++ backend/wbpublic/sqlide/sqlide_generics.cpp
@@ -38,7 +38,7 @@ public:
   template <typename T> result_type operator()(const T &v1, const T &v2) const { return true; }
   template <typename T1, typename T2> result_type operator()(const T1 &v1, const T2 &v2) const { return false; }
 };
-static const IsVarTypeEqTo is_var_type_eq_to;
+static IsVarTypeEqTo is_var_type_eq_to;
 
 bool is_var_null(const sqlite::Variant &value)
 {

$NetBSD: patch-backend_wbpublic_sqlide_var__grid__model.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $

--- backend/wbpublic/sqlide/var_grid_model.cpp.orig	2012-12-25 14:43:01.000000000 +0000
+++ backend/wbpublic/sqlide/var_grid_model.cpp
@@ -410,7 +410,7 @@ bool VarGridModel::set_field(const NodeI
       bool is_blob_column= sqlide::is_var_blob(_real_column_types[column]);
       if (!_optimized_blob_fetching || !is_blob_column)
       {
-        static const sqlide::VarEq var_eq;
+        static sqlide::VarEq var_eq;
         if (!is_blob_column)
           res= !boost::apply_visitor(var_eq, value, *cell);
         if (res)

$NetBSD: patch-library_forms_mforms.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $

--- library/forms/mforms.cpp.orig	2012-12-25 15:55:34.000000000 +0000
+++ library/forms/mforms.cpp
@@ -23,6 +23,8 @@
 #include "mforms/mforms.h"
 #include "mforms/simpleform.h"
 
+extern GThread *_mforms_main_thread;
+
 using namespace mforms;
 
 // The first time this method is called must be from the main thread, during 
@@ -33,7 +35,6 @@ ControlFactory *ControlFactory::get_inst
   if (!instance)
   {
     // Do some one time initializations.
-    extern GThread *_mforms_main_thread;
     _mforms_main_thread= g_thread_self();
 
     instance= new ControlFactory();

$NetBSD: patch-library_grt_src_grtpp__shell__lua.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $

--- library/grt/src/grtpp_shell_lua.cpp.orig	2012-12-25 14:27:07.000000000 +0000
+++ library/grt/src/grtpp_shell_lua.cpp
@@ -37,6 +37,7 @@
   #include <Windows.h>
 #endif
 
+extern void myx_grt_shell_show_help(grt::GRT *grt, const char *command);
 
 using namespace grt;
 using namespace base;
@@ -207,7 +208,6 @@ int LuaShell::set_global_var(const std::
 
 void LuaShell::show_help(const std::string &keyword)
 {
-  extern void myx_grt_shell_show_help(grt::GRT *grt, const char *command);
   
   myx_grt_shell_show_help(_grt, keyword.c_str());
 }

$NetBSD: patch-library_grt_src_grtpp__shell__python.cpp,v 1.1 2012/12/25 21:12:31 joerg Exp $

--- library/grt/src/grtpp_shell_python.cpp.orig	2012-12-25 14:24:41.000000000 +0000
+++ library/grt/src/grtpp_shell_python.cpp
@@ -22,6 +22,7 @@
 
 #ifdef ENABLE_PYTHON_MODULES
 #include "grtpp_shell_python.h"
+#include "grtpp_shell_python_help.h"
 #include "base/string_utilities.h"
 
 using namespace grt;
@@ -194,8 +195,6 @@ int PythonShell::set_global_var(const st
 
 void PythonShell::show_help(const std::string &keyword)
 {
-  extern void grt_shell_show_python_help(GRT *grt, const char *command);
-  
   grt_shell_show_python_help(_grt, keyword.c_str());
 }