[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[621] trunk

[<fr...@us...>]

Revision: 621
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=621&view=rev
Author:   fredm
Date:     2009-09-05 11:17:43 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
Use TargetConditionals.h macro rather than possibly gcc only macros.

Modified Paths:
--------------
    trunk/FuseGenerator/libspectrum.h
    trunk/FuseImporter/libspectrum.h
    trunk/libspectrum/libspectrum.h

Modified: trunk/FuseGenerator/libspectrum.h
===================================================================
--- trunk/FuseGenerator/libspectrum.h	2009-09-05 10:44:44 UTC (rev 620)
+++ trunk/FuseGenerator/libspectrum.h	2009-09-05 11:17:43 UTC (rev 621)
@@ -38,6 +38,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <TargetConditionals.h>
+
 #ifdef _WIN32
 
 #define WIN32_LEAN_AND_MEAN	/* Exclude rarely used stuff from Windows
@@ -200,7 +202,7 @@
 #define g_array_index(a,t,i) (*(((t*)a->data)+i))
 GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
 
-#if defined __x86_64__ || defined __ppc64__
+#ifdef TARGET_RT_64_BIT
 #define GINT_TO_POINTER(i)      ((gpointer)  (glong)(i))
 #define GPOINTER_TO_INT(p)      ((gint)   (glong)(p))
 #else

Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h	2009-09-05 10:44:44 UTC (rev 620)
+++ trunk/FuseImporter/libspectrum.h	2009-09-05 11:17:43 UTC (rev 621)
@@ -38,6 +38,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <TargetConditionals.h>
+
 #ifdef _WIN32
 
 #define WIN32_LEAN_AND_MEAN	/* Exclude rarely used stuff from Windows
@@ -200,7 +202,7 @@
 #define g_array_index(a,t,i) (*(((t*)a->data)+i))
 GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
 
-#if defined __x86_64__ || defined __ppc64__
+#ifdef TARGET_RT_64_BIT
 #define GINT_TO_POINTER(i)      ((gpointer)  (glong)(i))
 #define GPOINTER_TO_INT(p)      ((gint)   (glong)(p))
 #else

Modified: trunk/libspectrum/libspectrum.h
===================================================================
--- trunk/libspectrum/libspectrum.h	2009-09-05 10:44:44 UTC (rev 620)
+++ trunk/libspectrum/libspectrum.h	2009-09-05 11:17:43 UTC (rev 621)
@@ -38,6 +38,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <TargetConditionals.h>
+
 #ifdef _WIN32
 
 #define WIN32_LEAN_AND_MEAN	/* Exclude rarely used stuff from Windows
@@ -199,7 +201,7 @@
 #define g_array_index(a,t,i) (*(((t*)a->data)+i))
 GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
 
-#if defined __x86_64__ || defined __ppc64__
+#ifdef TARGET_RT_64_BIT
 #define GINT_TO_POINTER(i)      ((gpointer)  (glong)(i))
 #define GPOINTER_TO_INT(p)      ((gint)   (glong)(p))
 #else


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