Changeset 950d323 in tol

Timestamp:

Feb 10, 2015, 8:32:46 AM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

b6e5dacc

Parents:

98cc0a5

Message:

refs #1812, refs #1818 cambios requeridos desde la compilación de toltcl con CMake, DLLEXPORT extra en conflicto con DLLEXPORT de tcl, se fuerza el const de algunos argumentos

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6455 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol

Files:

• init.cpp (modified) (2 diffs)
• tol_bcommon.h (modified) (3 diffs)
• tol_init.h (modified) (1 diff)

tol/init.cpp

@@ -474 +474 @@
 
 //--------------------------------------------------------------------
-BBool InitGrammars(char* calledProgram)
+BBool InitGrammars(const char* calledProgram)
 //--------------------------------------------------------------------
 {
@@ -1498 +1498 @@
 
 //--------------------------------------------------------------------
-void InitTolKernel(char* calledProgram, int lang, const char* vmode ) 
+void InitTolKernel(const char* calledProgram, int lang, const char* vmode ) 
 //--------------------------------------------------------------------
 {

tol/tol_bcommon.h

@@ -112 +112 @@
 
 #ifdef STATIC_BUILD
-#   define DLLIMPORT
-#   define DLLEXPORT
+#   define TOL_DLLIMPORT
+#   define TOL_DLLEXPORT
 #else
 #   if (defined(WIN32) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || (defined(__GNUC__) && defined(__declspec)))) || (defined(MAC_TCL) && FUNCTION_DECLSPEC)
-#       define DLLIMPORT __declspec(dllimport)
-#       define DLLEXPORT __declspec(dllexport)
+#       define TOL_DLLIMPORT __declspec(dllimport)
+#       define TOL_DLLEXPORT __declspec(dllexport)
 
 #if (defined(_MSC_VER) && (_MSC_VER<1400))
@@ -135 +135 @@
 #pragma warning(disable : 4786)
 #   else
-#       define DLLIMPORT
-#       define DLLEXPORT
+#       define TOL_DLLIMPORT
+#       define TOL_DLLEXPORT
 #   endif
 #endif
@@ -145 +145 @@
 
 #ifdef TOLDLL_EXPORTS
-#    define TOL_API DLLEXPORT
-#else
-#    define TOL_API DLLIMPORT
+#    define TOL_API TOL_DLLEXPORT
+#else
+#    define TOL_API TOL_DLLIMPORT
 #endif
 

tol/tol_init.h

@@ -36 +36 @@
 TOL_API void  InitializeFromMainArgs(int argc, char *argv[], char *env[]);
 TOL_API void  LoadInitLibrary       (int loadInitProject, int loadDefaultPackages);
-TOL_API void  InitTolKernel         (char* calledProgram, int lang, const char* vmode);
+TOL_API void  InitTolKernel         (const char* calledProgram, int lang, const char* vmode);
 
 typedef void tgsl_error_handler