[Teem-commit] SF.net SVN: teem:[4221] teem/trunk/src/air/air.h

[<mic...@us...>]

Revision: 4221
          http://teem.svn.sourceforge.net/teem/?rev=4221&view=rev
Author:   michaelcallahan
Date:     2009-04-21 02:47:13 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
Fix compiler warning on mac.  _AIR_PTR_DIFF_T_CNV should just use the normal 32/64 bit mechanism now that mac supports both.

Modified Paths:
--------------
    teem/trunk/src/air/air.h

Modified: teem/trunk/src/air/air.h
===================================================================
--- teem/trunk/src/air/air.h	2009-04-21 01:11:44 UTC (rev 4220)
+++ teem/trunk/src/air/air.h	2009-04-21 02:47:13 UTC (rev 4221)
@@ -855,25 +855,20 @@
 ** no expectation that other projects which use Teem will be defining
 ** TEEM_32BIT, this is not useful outside Teem, thus the leading _.
 */
-#ifdef __APPLE__
-#  define _AIR_SIZE_T_CNV "%lu"
-#  define _AIR_PTRDIFF_T_CNV "%ld"
-#else
-#  if TEEM_32BIT == 0
-#    ifdef _WIN64
-#      define _AIR_SIZE_T_CNV "%I64u"
-#      define _AIR_PTRDIFF_T_CNV "%I64d"
-#    else
-#      define _AIR_SIZE_T_CNV "%lu"
-#      define _AIR_PTRDIFF_T_CNV "%ld"
-#    endif
-#  elif TEEM_32BIT == 1
-#    define _AIR_SIZE_T_CNV "%u"
-#    define _AIR_PTRDIFF_T_CNV "%d"
+#if TEEM_32BIT == 0
+#  ifdef _WIN64
+#    define _AIR_SIZE_T_CNV "%I64u"
+#    define _AIR_PTRDIFF_T_CNV "%I64d"
 #  else
-#    define _AIR_SIZE_T_CNV "(no _AIR_SIZE_T_CNV w/out TEEM_32BIT %*d)"
-#    define _AIR_PTRDIFF_T_CNV "(no _AIR_PTRDIFF_T_CNV w/out TEEM_32BIT %*d)"
+#    define _AIR_SIZE_T_CNV "%lu"
+#    define _AIR_PTRDIFF_T_CNV "%ld"
 #  endif
+#elif TEEM_32BIT == 1
+#  define _AIR_SIZE_T_CNV "%u"
+#  define _AIR_PTRDIFF_T_CNV "%d"
+#else
+#  define _AIR_SIZE_T_CNV "(no _AIR_SIZE_T_CNV w/out TEEM_32BIT %*d)"
+#  define _AIR_PTRDIFF_T_CNV "(no _AIR_PTRDIFF_T_CNV w/out TEEM_32BIT %*d)"
 #endif
 
 #ifdef __cplusplus


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.