[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 0076dc1f169917b0ed72ac97e1740e2664db6d8a
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Wed Feb 15 14:22:20 2012 +0100

    chg: const char* in iiAddCproc

diff --git a/Singular/ipid.h b/Singular/ipid.h
index 2eaedc3..576fd6e 100644
--- a/Singular/ipid.h
+++ b/Singular/ipid.h
@@ -68,7 +68,7 @@ extern proclevel *procstack;
 
 typedef struct
 {
-  int (*iiAddCproc)(char *libname, char *procname, BOOLEAN pstatic,
+  int (*iiAddCproc)(const char *libname, const char *procname, BOOLEAN pstatic,
                     BOOLEAN(*func)(leftv res, leftv v));
   int (*iiArithAddCmd)(const char *szName, short nAlias, short nTokval,
                        short nToktype, short nPos);
diff --git a/Singular/iplib.cc b/Singular/iplib.cc
index bccbc4c..072f265 100644
--- a/Singular/iplib.cc
+++ b/Singular/iplib.cc
@@ -1004,7 +1004,7 @@ procinfo *iiInitSingularProcinfo(procinfov pi, const char *libname,
 }
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
+int iiAddCproc(const char *libname, const char *procname, BOOLEAN pstatic,
                BOOLEAN(*func)(leftv res, leftv v))
 {
   procinfov pi;
@@ -1030,7 +1030,7 @@ int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
 }
 
 #ifdef HAVE_DYNAMIC_LOADING
-int iiAddCprocTop(char *libname, char *procname, BOOLEAN pstatic,
+int iiAddCprocTop(const char *libname, const char *procname, BOOLEAN pstatic,
                BOOLEAN(*func)(leftv res, leftv v))
 {
   int r=iiAddCproc(libname,procname,pstatic,func);
@@ -1048,9 +1048,9 @@ BOOLEAN load_modules(char *newlib, char *fullname, BOOLEAN autoexport)
   WerrorS("mod_init: static version can not load modules");
   return TRUE;
 #else
-  int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
+  int iiAddCproc(const char *libname, const char *procname, BOOLEAN pstatic,
                  BOOLEAN(*func)(leftv res, leftv v));
-  typedef int (*fktn_t)(int(*iiAddCproc)(char *libname, char *procname,
+  typedef int (*fktn_t)(int(*iiAddCproc)(const char *libname, const char *procname,
                                BOOLEAN pstatic,
                                BOOLEAN(*func)(leftv res, leftv v)));
   typedef int (*fktn2_t)(SModulFunctions*);
diff --git a/Singular/ipshell.h b/Singular/ipshell.h
index 2213a34..2b2fad3 100644
--- a/Singular/ipshell.h
+++ b/Singular/ipshell.h
@@ -185,7 +185,7 @@ void  singular_example(char *str);
 
 BOOLEAN iiTryLoadLib(leftv v, const char *id);
 
-int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
+int iiAddCproc(const char *libname, const char *procname, BOOLEAN pstatic,
                BOOLEAN(*func)(leftv res, leftv v));
 
 void iiCheckPack(package &p);
diff --git a/Singular/pyobject.cc b/Singular/pyobject.cc
index 46a8279..cd730eb 100644
--- a/Singular/pyobject.cc
+++ b/Singular/pyobject.cc
@@ -619,10 +619,10 @@ void sync_contexts()
 
 
 // forward declaration
-int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
+int iiAddCproc(const char *libname, const char *procname, BOOLEAN pstatic,
                BOOLEAN(*func)(leftv res, leftv v));
 
-#define ADD_C_PROC(name) iiAddCproc("", (char*)#name, FALSE, name);
+#define ADD_C_PROC(name) iiAddCproc("", #name, FALSE, name);
 
 
 void pyobject_init() 

-- 
an open source computer algebra system