Merge branch 'pjohangustavsson-patch-1'

* pjohangustavsson-patch-1:
  Add C# -namespace symbol fix into CHANGES
  Update csharp.cxx

CHANGES.current

@@ -5,6 +5,14 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.9 (in progress)
 ===========================
 
+2016-02-06: pjohangustavsson
+            [C#] Fix duplicate symbol problems when linking the source generated
+            from multiple SWIG modules into one shared library for the -namespace
+            option. The namespace is now mangled into the global PInvoke function
+            names.
+
+            *** POTENTIAL INCOMPATIBILITY ***
+
 2016-01-27: ahnolds
             [Python] Added support for differentiating between Python Bytes
             and Unicode objects using by defining SWIG_PYTHON_STRICT_BYTE_CHAR

Source/Modules/csharp.cxx

@@ -415,8 +415,16 @@ class CSHARP:public Language {
     }
 
     Printf(f_runtime, "\n");
+    if (namespce) {
+      String *wrapper_name = NewStringf("");
+      Printf(wrapper_name, "CSharp_%s_%%f", namespce);
+      Swig_name_register("wrapper", wrapper_name);
+      Delete(wrapper_name);
+    }
+    else {
+      Swig_name_register("wrapper", "CSharp_%f");
+    }
 
-    Swig_name_register("wrapper", "CSharp_%f");
     if (old_variable_names) {
       Swig_name_register("set", "set_%n%v");
       Swig_name_register("get", "get_%n%v");