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

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

Revision: 622
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=622&view=rev
Author:   fredm
Date:     2009-09-05 12:13:59 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
Remember that libspectrum.h is generated from generate.pl. Now the gcrypt
removal sticks.

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

Modified: trunk/FuseGenerator/generate.pl
===================================================================
--- trunk/FuseGenerator/generate.pl	2009-09-05 11:17:43 UTC (rev 621)
+++ trunk/FuseGenerator/generate.pl	2009-09-05 12:13:59 UTC (rev 622)
@@ -141,8 +141,15 @@
 #define g_array_index(a,t,i) (*(((t*)a->data)+i))
 GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
 
+#include <TargetConditionals.h>
+
+#ifdef TARGET_RT_64_BIT
+#define GINT_TO_POINTER(i)      ((gpointer)  (glong)(i))
+#define GPOINTER_TO_INT(p)      ((gint)   (glong)(p))
+#else
 #define GINT_TO_POINTER(i)      ((gpointer)  (i))
 #define GPOINTER_TO_INT(p)      ((gint)   (p))
+#endif
 CODE
 }
 

Modified: trunk/FuseImporter/generate.pl
===================================================================
--- trunk/FuseImporter/generate.pl	2009-09-05 11:17:43 UTC (rev 621)
+++ trunk/FuseImporter/generate.pl	2009-09-05 12:13:59 UTC (rev 622)
@@ -141,8 +141,15 @@
 #define g_array_index(a,t,i) (*(((t*)a->data)+i))
 GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
 
+#include <TargetConditionals.h>
+
+#ifdef TARGET_RT_64_BIT
+#define GINT_TO_POINTER(i)      ((gpointer)  (glong)(i))
+#define GPOINTER_TO_INT(p)      ((gint)   (glong)(p))
+#else
 #define GINT_TO_POINTER(i)      ((gpointer)  (i))
 #define GPOINTER_TO_INT(p)      ((gint)   (p))
+#endif
 CODE
 }
 

Modified: trunk/libspectrum/generate.pl
===================================================================
--- trunk/libspectrum/generate.pl	2009-09-05 11:17:43 UTC (rev 621)
+++ trunk/libspectrum/generate.pl	2009-09-05 12:13:59 UTC (rev 622)
@@ -141,20 +141,27 @@
 #define g_array_index(a,t,i) (*(((t*)a->data)+i))
 GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
 
+#include <TargetConditionals.h>
+
+#ifdef TARGET_RT_64_BIT
+#define GINT_TO_POINTER(i)      ((gpointer)  (glong)(i))
+#define GPOINTER_TO_INT(p)      ((gint)   (glong)(p))
+#else
 #define GINT_TO_POINTER(i)      ((gpointer)  (i))
 #define GPOINTER_TO_INT(p)      ((gint)   (p))
+#endif
 CODE
 }
 
 if( /LIBSPECTRUM_INCLUDE_GCRYPT/ ) {
 
-  $_ = "#include <gcrypt.h>\n";
+  $_ = '';
 
 }
 
 if( /LIBSPECTRUM_SIGNATURE_PARAMETERS/ ) {
 
-  $_ = "  /* The DSA signature parameters 'r' and 's' */\n  gcry_mpi_t r, s;\n";
+  $_ = "/* Signature parameters not stored as libgcrypt is not present */\n";
 
 }
 

Modified: trunk/libspectrum/libspectrum.h
===================================================================
--- trunk/libspectrum/libspectrum.h	2009-09-05 11:17:43 UTC (rev 621)
+++ trunk/libspectrum/libspectrum.h	2009-09-05 12:13:59 UTC (rev 622)
@@ -38,8 +38,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <TargetConditionals.h>
-
 #ifdef _WIN32
 
 #define WIN32_LEAN_AND_MEAN	/* Exclude rarely used stuff from Windows
@@ -64,6 +62,7 @@
 #define DEPRECATED 
 #endif                          /* #ifdef __GNUC__ */
 
+
 /* Standard typedefs */
 #include <stdint.h>
 
@@ -201,6 +200,8 @@
 #define g_array_index(a,t,i) (*(((t*)a->data)+i))
 GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
 
+#include <TargetConditionals.h>
+
 #ifdef TARGET_RT_64_BIT
 #define GINT_TO_POINTER(i)      ((gpointer)  (glong)(i))
 #define GPOINTER_TO_INT(p)      ((gint)   (glong)(p))
@@ -855,8 +856,7 @@
 int WIN32_DLL libspectrum_snap_fuller_box_active( libspectrum_snap *snap );
 void WIN32_DLL libspectrum_snap_set_fuller_box_active( libspectrum_snap *snap, int fuller_box_active );
 int WIN32_DLL libspectrum_snap_melodik_active( libspectrum_snap *snap );
-void WIN32_DLL libspectrum_snap_set_melodik_active( libspectrum_snap *snap, int
-                                                    melodik_active );
+void WIN32_DLL libspectrum_snap_set_melodik_active( libspectrum_snap *snap, int melodik_active );
 
 /*
  * Tape handling routines


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