hdf5 load/unload updated to avoid symbol crushing

Change-Id: Ied68218facf0c9619782bb8f334e996acba0e697

diff --git a/scilab/modules/hdf5/includes/gw_hdf5.h b/scilab/modules/hdf5/includes/gw_hdf5.h
index f138920..33f5ec5 100644 (file)
--- a/scilab/modules/hdf5/includes/gw_hdf5.h
+++ b/scilab/modules/hdf5/includes/gw_hdf5.h
@@ -18,8 +18,8 @@
 /*--------------------------------------------------------------------------*/
 #include "dynlib_hdf5_scilab.h"
 /*--------------------------------------------------------------------------*/
-HDF5_SCILAB_IMPEXP int Initialize(void);
-HDF5_SCILAB_IMPEXP int Finalize(void);
+HDF5_SCILAB_IMPEXP int Initialize_HDF5(void);
+HDF5_SCILAB_IMPEXP int Finalize_HDF5(void);
 /*--------------------------------------------------------------------------*/
 HDF5_SCILAB_IMPEXP int sci_hdf5_load_v1(char *fname, int* pvApiCtx);
 HDF5_SCILAB_IMPEXP int sci_hdf5_load_v2(char *fname, int* pvApiCtx);

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/hdf5_gw.cpp b/scilab/modules/hdf5/sci_gateway/cpp/hdf5_gw.cpp
index 44b84f2..d0649dd 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/hdf5_gw.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/hdf5_gw.cpp
@@ -27,14 +27,14 @@ extern "C"
 #include "h5_fileManagement.h"
 }
 /*--------------------------------------------------------------------------*/
-int Initialize(void)
+int Initialize_HDF5(void)
 {
     org_modules_hdf5::H5VariableScope::initScope();
     org_modules_hdf5::H5Object::initRoot();
     return 0;
 }
 /*--------------------------------------------------------------------------*/
-int Finalize(void)
+int Finalize_HDF5(void)
 {
     org_modules_hdf5::H5Type::cleanMap();
     //org_modules_hdf5::H5VariableScope::clearScope();
@@ -44,5 +44,3 @@ int Finalize(void)
     return 0;
 }
 /*--------------------------------------------------------------------------*/
-
-

diff --git a/scilab/modules/hdf5/src/c/DllmainHdf5.c b/scilab/modules/hdf5/src/c/DllmainHdf5.c
index d6e40bc..b543503 100644 (file)
--- a/scilab/modules/hdf5/src/c/DllmainHdf5.c
+++ b/scilab/modules/hdf5/src/c/DllmainHdf5.c
@@ -34,12 +34,12 @@ int WINAPI DllMain(HINSTANCE hinstDLL, DWORD flag, LPVOID reserved)
     {
         case DLL_PROCESS_ATTACH :
         {
-            Initialize();
+            Initialize_HDF5();
             break;
         }
         case DLL_PROCESS_DETACH :
         {
-            Finalize();
+            Finalize_HDF5();
             break;
         }
         case DLL_THREAD_ATTACH :
@@ -58,18 +58,17 @@ int WINAPI DllMain(HINSTANCE hinstDLL, DWORD flag, LPVOID reserved)
     return 1;
 }
 #else
-void __attribute__ ((constructor)) load(void);
-void __attribute__ ((destructor)) unload(void);
+void __attribute__ ((constructor)) load_hdf5(void);
+void __attribute__ ((destructor)) unload_hdf5(void);
 
-void load(void)
+void load_hdf5(void)
 {
-    Initialize();
+    Initialize_HDF5();
 }
 
-void unload(void)
+void unload_hdf5(void)
 {
-    Finalize();
+    Finalize_HDF5();
 }
 #endif
 /*--------------------------------------------------------------------------*/
-