capisuite/capisuite-0.4.5-python25.patch

   1 --- src/application/pythonscript.cpp.orig       2004-11-28 14:35:24.000000000 +0100
   2 +++ src/application/pythonscript.cpp    2008-08-03 17:12:45.000000000 +0200
   3 @@ -99,14 +99,14 @@
   4                         if ( !(py_traceback=cStringIO->cgetvalue(catch_stderr)) )
   5                                 throw ApplicationError("unable to get traceback","PythonScript::run()");
   6
   7 -                       int length;
   8 +                       Py_ssize_t length;
   9                         char *traceback;
  10                         if (PyString_AsStringAndSize(py_traceback, &traceback, &length))
  11                                 throw ApplicationError("unable to convert traceback to char*","PythonScript::run()");
  12
  13                          error << prefix() << "A python error occured. See traceback below." << endl;
  14                         error << prefix(false) << "Python traceback: ";
  15 -                       for (int i=0;i<length-1;i++) {
  16 +                       for (Py_ssize_t i=0;i<length-1;i++) {
  17                                 error << traceback[i];
  18                                 if (traceback[i]=='\n')
  19                                         error << prefix(false) << "Traceback: ";
  20 --- src/application/idlescript.cpp.orig 2004-11-28 14:35:24.000000000 +0100
  21 +++ src/application/idlescript.cpp      2008-08-03 17:13:55.000000000 +0200
  22 @@ -28,6 +28,7 @@
  23         IdleScript *instance=static_cast<IdleScript*>(arg);
  24         instance->run();
  25         pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
  26 +       return NULL;
  27  }
  28
  29  void idlescript_cleanup_handler(void* arg)
  30 --- src/application/incomingscript.cpp.orig     2004-11-28 14:35:24.000000000 +0100
  31 +++ src/application/incomingscript.cpp  2008-08-03 17:14:36.000000000 +0200
  32 @@ -31,6 +31,7 @@
  33         IncomingScript *instance=static_cast<IncomingScript*>(arg);
  34         instance->run();
  35         pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
  36 +       return NULL;
  37  }
  38
  39  void incomingscript_cleanup_handler(void* arg)
  40 --- src/backend/capi.cpp.orig   2008-08-03 17:10:41.000000000 +0200
  41 +++ src/backend/capi.cpp        2008-08-03 17:21:37.000000000 +0200
  42 @@ -30,6 +30,7 @@
  43
  44         Capi *instance=static_cast<Capi*>(arg);
  45         instance->run();
  46 +       return NULL;
  47  }
  48
  49  Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned short DDILength, unsigned short DDIBaseLength, vector<string> DDIStopNumbers, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiError, CapiMsgError)