[artoolkit-commits] artoolkit/lib/SRC/VideoMacOSX video.c,1.10,1.11

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19579

Modified Files:
	video.c 
Log Message:
PTHREAD_CANCELED now available.

Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** video.c	16 Aug 2005 00:50:07 -0000	1.10
--- video.c	18 Aug 2005 18:23:00 -0000	1.11
***************
*** 101,104 ****
--- 101,111 ----
  #define AR_VIDEO_STATUS_BIT_BUFFER  0x02			// Clear when buffer 1 is valid for writes, set when buffer 2 is valid for writes. 
  
+ // Early Mac OS X implementations of pthreads failed to define PTHREAD_CANCELED.
+ #ifdef PTHREAD_CANCELED
+ #  define AR_PTHREAD_CANCELLED PTHREAD_CANCELED
+ #else
+ #  define AR_PTHREAD_CANCELLED ((void *) 1);
+ #endif
+ 
  // ============================================================================
  //	Private types
***************
*** 1669,1674 ****
  		}
  		vid->threadRunning = 0;
! 		// Exit status should be ((exit_status_p == PTHREAD_CANCELED) ? 0 : *(ERROR_t *)(exit_status_p))
! 		// except Apple's pthread's implementation doesn't appear to provide PTHREAD_CANCELED.
  	}
  	
--- 1676,1681 ----
  		}
  		vid->threadRunning = 0;
! 		
! 		// Exit status is ((exit_status_p == AR_PTHREAD_CANCELLED) ? 0 : *(ERROR_t *)(exit_status_p))
  	}