refs modelica#4576: Apply name mangling to avoid MSVC duplicated symbols issue

Author: beutlich

Modelica/Resources/C-Sources/ModelicaInternal.c

@@ -776,14 +776,14 @@ static FileCache* fileCache = NULL;
 #include <pthread.h>
 #if defined(G_HAS_CONSTRUCTORS)
 static pthread_mutex_t m;
-G_DEFINE_CONSTRUCTOR(initializeMutex)
-static void initializeMutex(void) {
+G_DEFINE_CONSTRUCTOR(G_FUNCNAME(initializeMutex))
+static void G_FUNCNAME(initializeMutex)(void) {
     if (pthread_mutex_init(&m, NULL) != 0) {
         ModelicaError("Initialization of mutex failed\n");
     }
 }
-G_DEFINE_DESTRUCTOR(destroyMutex)
-static void destroyMutex(void) {
+G_DEFINE_DESTRUCTOR(G_FUNCNAME(destroyMutex))
+static void G_FUNCNAME(destroyMutex)(void) {
     if (pthread_mutex_destroy(&m) != 0) {
         ModelicaError("Destruction of mutex failed\n");
     }
@@ -800,17 +800,17 @@ static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
 #include <windows.h>
 static CRITICAL_SECTION cs;
 #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(ModelicaInternal_initializeCS)
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(G_FUNCNAME(ModelicaInternal_initializeCS))
 #endif
-G_DEFINE_CONSTRUCTOR(ModelicaInternal_initializeCS)
-static void ModelicaInternal_initializeCS(void) {
+G_DEFINE_CONSTRUCTOR(G_FUNCNAME(ModelicaInternal_initializeCS))
+static void G_FUNCNAME(ModelicaInternal_initializeCS)(void) {
     InitializeCriticalSection(&cs);
 }
 #ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(ModelicaInternal_deleteCS)
+#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(G_FUNCNAME(ModelicaInternal_deleteCS))
 #endif
-G_DEFINE_DESTRUCTOR(ModelicaInternal_deleteCS)
-static void ModelicaInternal_deleteCS(void) {
+G_DEFINE_DESTRUCTOR(G_FUNCNAME(ModelicaInternal_deleteCS))
+static void G_FUNCNAME(ModelicaInternal_deleteCS)(void) {
     DeleteCriticalSection(&cs);
 }
 #define MUTEX_LOCK() EnterCriticalSection(&cs)

Modelica/Resources/C-Sources/ModelicaRandom.c

@@ -75,17 +75,17 @@ static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
 #include <windows.h>
 static CRITICAL_SECTION cs;
 #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(ModelicaRandom_initializeCS)
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(G_FUNCNAME(ModelicaRandom_initializeCS))
 #endif
-G_DEFINE_CONSTRUCTOR(ModelicaRandom_initializeCS)
-static void ModelicaRandom_initializeCS(void) {
+G_DEFINE_CONSTRUCTOR(G_FUNCNAME(ModelicaRandom_initializeCS))
+static void G_FUNCNAME(ModelicaRandom_initializeCS)(void) {
     InitializeCriticalSection(&cs);
 }
 #ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(ModelicaRandom_deleteCS)
+#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(G_FUNCNAME(ModelicaRandom_deleteCS))
 #endif
-G_DEFINE_DESTRUCTOR(ModelicaRandom_deleteCS)
-static void ModelicaRandom_deleteCS(void) {
+G_DEFINE_DESTRUCTOR(G_FUNCNAME(ModelicaRandom_deleteCS))
+static void G_FUNCNAME(ModelicaRandom_deleteCS)(void) {
     DeleteCriticalSection(&cs);
 }
 #define MUTEX_LOCK() EnterCriticalSection(&cs)

Modelica/Resources/C-Sources/ModelicaStandardTables.c

@@ -435,14 +435,14 @@ static TableShare* tableShare = NULL;
 #include <pthread.h>
 #if defined(G_HAS_CONSTRUCTORS)
 static pthread_mutex_t m;
-G_DEFINE_CONSTRUCTOR(initializeMutex)
-static void initializeMutex(void) {
+G_DEFINE_CONSTRUCTOR(G_FUNCNAME(initializeMutex))
+static void G_FUNCNAME(initializeMutex)(void) {
     if (pthread_mutex_init(&m, NULL) != 0) {
         ModelicaError("Initialization of mutex failed\n");
     }
 }
-G_DEFINE_DESTRUCTOR(destroyMutex)
-static void destroyMutex(void) {
+G_DEFINE_DESTRUCTOR(G_FUNCNAME(destroyMutex))
+static void G_FUNCNAME(destroyMutex)(void) {
     if (pthread_mutex_destroy(&m) != 0) {
         ModelicaError("Destruction of mutex failed\n");
     }
@@ -459,17 +459,17 @@ static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
 #include <windows.h>
 static CRITICAL_SECTION cs;
 #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(ModelicaStandardTables_initializeCS)
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(G_FUNCNAME(ModelicaStandardTables_initializeCS))
 #endif
-G_DEFINE_CONSTRUCTOR(ModelicaStandardTables_initializeCS)
-static void ModelicaStandardTables_initializeCS(void) {
+G_DEFINE_CONSTRUCTOR(G_FUNCNAME(ModelicaStandardTables_initializeCS))
+static void G_FUNCNAME(ModelicaStandardTables_initializeCS)(void) {
     InitializeCriticalSection(&cs);
 }
 #ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(ModelicaStandardTables_deleteCS)
+#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(G_FUNCNAME(ModelicaStandardTables_deleteCS))
 #endif
-G_DEFINE_DESTRUCTOR(ModelicaStandardTables_deleteCS)
-static void ModelicaStandardTables_deleteCS(void) {
+G_DEFINE_DESTRUCTOR(G_FUNCNAME(ModelicaStandardTables_deleteCS))
+static void G_FUNCNAME(ModelicaStandardTables_deleteCS)(void) {
     DeleteCriticalSection(&cs);
 }
 #define MUTEX_LOCK() EnterCriticalSection(&cs)