[PD-cvs] externals/grill/flext/source flcwmax-thr.h,1.4,1.5 flcwmax-x-thr.h,1.4,1.5 flcwmax-x.h,1.5,1.6 flprefix.h,1.26,1.27 flstdc.h,1.20,1.21 flsupport.cpp,1.34,1.35 fltimer.cpp,1.3,1.4

[Thomas Grill]

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

Modified Files:
	flcwmax-thr.h flcwmax-x-thr.h flcwmax-x.h flprefix.h flstdc.h 
	flsupport.cpp fltimer.cpp 
Log Message:
 ""

Index: flprefix.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flprefix.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** flprefix.h	23 Feb 2004 03:27:46 -0000	1.26
--- flprefix.h	27 Mar 2004 03:22:14 -0000	1.27
***************
*** 190,196 ****
--- 190,198 ----
  	#ifndef FLEXT_OSAPI
  		#if TARGET_API_MAC_MACH
+ 			// this is for Mach-O
  			// this has the precedence (MACH also supports Carbon, of course)
  			#define FLEXT_OSAPI FLEXT_OSAPI_MAC_MACH
  		#elif TARGET_API_MAC_CARBON
+ 			// this is for CFM
  			#define FLEXT_OSAPI FLEXT_OSAPI_MAC_CARBON
  		#else

Index: flcwmax-x-thr.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flcwmax-x-thr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** flcwmax-x-thr.h	15 Apr 2003 02:32:42 -0000	1.4
--- flcwmax-x-thr.h	27 Mar 2004 03:22:14 -0000	1.5
***************
*** 22,26 ****
  	is needed for pthreads
  */
! #if defined(__MWERKS__) && (__MWERKS__ <= 0x6000)
  	typedef unsigned int sigset_t;
  	#define _CW_NOPRECOMP // no precompiled headers
--- 22,26 ----
  	is needed for pthreads
  */
! #if defined(__MWERKS__) && (__MWERKS__ == 1)  // read __MWERKS__ numbering starts with CW7
  	typedef unsigned int sigset_t;
  	#define _CW_NOPRECOMP // no precompiled headers

Index: flcwmax-x.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flcwmax-x.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** flcwmax-x.h	17 Apr 2003 02:33:16 -0000	1.5
--- flcwmax-x.h	27 Mar 2004 03:22:14 -0000	1.6
***************
*** 16,20 ****
  #define _FLEXT_CW_MAX_X_H
  
! #define TARGET_API_MAC_CARBON 1
  #define _POSIX_C_SOURCE
  #define _POSIX_SOURCE
--- 16,20 ----
  #define _FLEXT_CW_MAX_X_H
  
! //#define TARGET_API_MAC_CARBON 1
  #define _POSIX_C_SOURCE
  #define _POSIX_SOURCE

Index: flstdc.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstdc.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** flstdc.h	26 Mar 2004 03:22:11 -0000	1.20
--- flstdc.h	27 Mar 2004 03:22:14 -0000	1.21
***************
*** 98,101 ****
--- 98,102 ----
  #endif
  
+ 
  #include "ext.h"
  #include "ext_user.h"
***************
*** 112,116 ****
  typedef t_object *t_thing;
  
! typedef void *t_qelem;
  
  typedef method t_method;
--- 113,121 ----
  typedef t_object *t_thing;
  
! #if FLEXT_OS == FLEXT_OS_WIN
! typedef void *t_qelem;  // qelem not defined in Windows SDK 
! #else
! typedef qelem t_qelem;
! #endif
  
  typedef method t_method;

Index: flcwmax-thr.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flcwmax-thr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** flcwmax-thr.h	15 Apr 2003 02:32:42 -0000	1.4
--- flcwmax-thr.h	27 Mar 2004 03:22:14 -0000	1.5
***************
*** 22,26 ****
  	is needed for pthreads
  */
! #if defined(__MWERKS__) && (__MWERKS__ <= 0x6000)
  	typedef unsigned int sigset_t;
  	#define _CW_NOPRECOMP // no precompiled headers
--- 22,26 ----
  	is needed for pthreads
  */
! #if defined(__MWERKS__) && (__MWERKS__ == 1)  // read __MWERKS__ numbering starts with CW7
  	typedef unsigned int sigset_t;
  	#define _CW_NOPRECOMP // no precompiled headers

Index: fltimer.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/fltimer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fltimer.cpp	22 Jul 2003 02:32:51 -0000	1.3
--- fltimer.cpp	27 Mar 2004 03:22:14 -0000	1.4
***************
*** 134,138 ****
  #elif FLEXT_SYS == FLEXT_SYS_MAX
  	clock_free(clk);
! 	if(queued) qelem_free(qelem);
  #else
  	#error Not implemented
--- 134,138 ----
  #elif FLEXT_SYS == FLEXT_SYS_MAX
  	clock_free(clk);
! 	if(queued) ::qelem_free(qelem);
  #else
  	#error Not implemented
***************
*** 146,150 ****
  #elif FLEXT_SYS == FLEXT_SYS_MAX
  	clock_unset(clk);
! 	if(queued) qelem_unset(qelem);
  #else
  	#error Not implemented
--- 146,150 ----
  #elif FLEXT_SYS == FLEXT_SYS_MAX
  	clock_unset(clk);
! 	if(queued) ::qelem_unset(qelem);
  #else
  	#error Not implemented

Index: flsupport.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** flsupport.cpp	26 Mar 2004 03:22:11 -0000	1.34
--- flsupport.cpp	27 Mar 2004 03:22:14 -0000	1.35
***************
*** 144,148 ****
      char *blk;
      if(bytes >= LARGEALLOC) {
! #if FLEXT_SYS == FLEXT_SYS_MAX
          blk = (char *)::sysmem_newptr(bytes);
  #else
--- 144,148 ----
      char *blk;
      if(bytes >= LARGEALLOC) {
! #if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_)
          blk = (char *)::sysmem_newptr(bytes);
  #else
***************
*** 177,181 ****
  
      if(bytes >= LARGEALLOC) {
! #if FLEXT_SYS == FLEXT_SYS_MAX
          ::sysmem_freeptr(ori);
  #else
--- 177,181 ----
  
      if(bytes >= LARGEALLOC) {
! #if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_)
          ::sysmem_freeptr(ori);
  #else
***************
*** 205,209 ****
      char *blk;
      if(bytes >= LARGEALLOC) {
! #if FLEXT_SYS == FLEXT_SYS_MAX
          blk = (char *)::sysmem_newptr(bytes);
  #else
--- 205,209 ----
      char *blk;
      if(bytes >= LARGEALLOC) {
! #if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_)
          blk = (char *)::sysmem_newptr(bytes);
  #else
***************
*** 239,243 ****
  
      if(bytes >= LARGEALLOC) {
! #if FLEXT_SYS == FLEXT_SYS_MAX
          ::sysmem_freeptr(ori);
  #else
--- 239,243 ----
  
      if(bytes >= LARGEALLOC) {
! #if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_)
          ::sysmem_freeptr(ori);
  #else
***************
*** 304,308 ****
  
  	char buf[1024];
!     strcpy(buf,"error: ");
      vsnprintf(buf+7,sizeof buf-7,fmt, ap);
  	buf[sizeof buf-1] = 0; // in case of full buffer
--- 304,308 ----
  
  	char buf[1024];
!     STD::strcpy(buf,"error: ");
      vsnprintf(buf+7,sizeof buf-7,fmt, ap);
  	buf[sizeof buf-1] = 0; // in case of full buffer