[artoolkit-commits] artoolkit/include/AR gsub_lite.h,1.1.1.1,1.2

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

Update of /cvsroot/artoolkit/artoolkit/include/AR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12961

Modified Files:
	gsub_lite.h 
Log Message:
Revert to use of int rather than BOOL.

Index: gsub_lite.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gsub_lite.h	4 Nov 2004 08:51:14 -0000	1.1.1.1
--- gsub_lite.h	18 Feb 2005 04:18:36 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
   *	2.7.4	2004-07-14	PRL		Added gluCheckExtension hack for GLU versions pre-1.3.
   *	2.7.5	2004-07-15	PRL		Added arglDispImageStateful(); removed extraneous glPixelStorei(GL_UNPACK_IMAGE_HEIGHT,...) calls.
+  *	2.7.6	2005-02-18	PRL		Go back to using int rather than BOOL, to avoid conflict with Objective-C.
   *
   */
***************
*** 110,117 ****
  
  // Keep code nicely typed.
- #if !defined(_WINDEF_H) && !defined(XFree86Server) && !defined(BOOL_DEFINED)
- typedef int BOOL;
- #  define BOOL_DEFINED
- #endif
  #ifndef TRUE
  #  define TRUE 1
--- 111,114 ----
***************
*** 208,216 ****
  	@availability First appeared in ARToolKit 2.68.
   */
! extern BOOL arglTexRectangle;
  
  #if defined(__APPLE__) && defined(APPLE_TEXTURE_FAST_TRANSFER)
! extern BOOL arglAppleClientStorage;
! extern BOOL arglAppleTextureRange;
  extern GLuint arglAppleTextureRangeStorageHint;
  #endif // __APPLE__ && APPLE_TEXTURE_FAST_TRANSFER
--- 205,213 ----
  	@availability First appeared in ARToolKit 2.68.
   */
! extern int arglTexRectangle;
  
  #if defined(__APPLE__) && defined(APPLE_TEXTURE_FAST_TRANSFER)
! extern int arglAppleClientStorage;
! extern int arglAppleTextureRange;
  extern GLuint arglAppleTextureRangeStorageHint;
  #endif // __APPLE__ && APPLE_TEXTURE_FAST_TRANSFER