Changeset 927 for trunk

Timestamp:

May 28, 2019, 11:44:36 AM (6 years ago)

Author:

djay

Message:

Declare const char* only for Python 3

File:

• trunk/zoo-project/zoo-kernel/service_internal_python.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/service_internal_python.c

@@ -351 +351 @@
   PyObject *ptype, *pvalue, *ptraceback,*pValue,*pArgs;
   PyErr_Fetch(&ptype, &pvalue, &ptraceback);
-  const char *pStrErrorMessage = PyString_AsString(pvalue);
+#if PY_MAJOR_VERSION >= 3  
+  const
+#endif
+    char *pStrErrorMessage = PyString_AsString(pvalue);
   char *tmp0=_("Python module %s cannot be loaded. Message: %s\n");
   
@@ -698 +701 @@
     if(strncmp(PyString_AsString(key),"child",5)!=0){
       if(strncmp(PyString_AsString(key),"value",5)==0){
-        const char *buffer=NULL;
+#if PY_MAJOR_VERSION >= 3  
+        const
+#endif
+          char *buffer=NULL;
         Py_ssize_t size;
 #if PY_MAJOR_VERSION >= 3
@@ -720 +726 @@
         res = addToMapWithSize(res,PyString_AsString(key),buffer,size);
       }else{
-        const char* lkey=PyString_AsString(key);
-        const char* lvalue=PyString_AsString(value);
+#if PY_MAJOR_VERSION >= 3  
+        const
+#endif
+          char* lkey=PyString_AsString(key);
+#if PY_MAJOR_VERSION >= 3  
+        const
+#endif
+          char* lvalue=PyString_AsString(value);
         if(res!=NULL){
           if(PyString_Size(value)>0)