[PD-cvs] externals/grill/py/source main.cpp,1.13,1.14 main.h,1.19,1.20 pyext.cpp,1.16,1.17

[Thomas Grill]

Update of /cvsroot/pure-data/externals/grill/py/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11752/source

Modified Files:
	main.cpp main.h pyext.cpp 
Log Message:
 ""

Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main.cpp	21 Jun 2004 14:04:15 -0000	1.13
--- main.cpp	22 Jun 2004 22:45:53 -0000	1.14
***************
*** 154,158 ****
  			for(;;) {
  				char buf[1024];
! 				char *nl = strchr(s,'\n');
  				if(!nl) {
  					// no more newline found
--- 154,158 ----
  			for(;;) {
  				char buf[1024];
! 				char *nl = strchr((char *)s,'\n'); // the cast is for Borland C++
  				if(!nl) {
  					// no more newline found

Index: main.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** main.h	21 Jun 2004 14:04:15 -0000	1.19
--- main.h	22 Jun 2004 22:45:53 -0000	1.20
***************
*** 30,34 ****
  #endif
  
! #define PY__VERSION "0.1.3pre"
  
  
--- 30,34 ----
  #endif
  
! #define PY__VERSION "0.1.3"
  
  
***************
*** 51,55 ****
--- 51,57 ----
  #include "main.h"
  
+ #ifdef FLEXT_THREADS
  typedef std::map<flext::thrid_t,PyThreadState *> PyThrMap;
+ #endif
  
  class py:

Index: pyext.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pyext.cpp	21 Jun 2004 14:04:15 -0000	1.16
--- pyext.cpp	22 Jun 2004 22:45:53 -0000	1.17
***************
*** 454,457 ****
--- 454,458 ----
  #endif
  	{
+ #ifdef FLEXT_THREADS
          // --- make new Python thread ---
          // get the global lock
***************
*** 464,468 ****
  
          // store new thread state
- #ifdef FLEXT_THREADS
          pythrmap[GetThreadId()] = newthr;
  #endif
--- 465,468 ----
***************
*** 477,481 ****
          // delete mapped thread state
          pythrmap.erase(GetThreadId());
- #endif
  
          // --- delete Python thread ---
--- 477,480 ----
***************
*** 491,494 ****
--- 490,494 ----
          PyEval_ReleaseLock();
          // -----------------------------
+ #endif
  	}
  	--thrcount;