r16626 - gnucash/branches/gda-dev/src/backend/gda - Fix compilation on 64-bit platforms.

[Andreas Köhler]

Author: andi5
Date: 2007-12-08 23:21:23 -0500 (Sat, 08 Dec 2007)
New Revision: 16626
Trac: http://svn.gnucash.org/trac/changeset/16626

Modified:
   gnucash/branches/gda-dev/src/backend/gda/gnc-backend-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c
Log:
Fix compilation on 64-bit platforms.


Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-backend-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-backend-gda.c	2007-12-09 04:21:19 UTC (rev 16625)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-backend-gda.c	2007-12-09 04:21:23 UTC (rev 16626)
@@ -711,7 +711,7 @@
     } else if( strcmp( pPredData->type_name, "gint64" ) == 0 ) {
         query_int64_t pData = (query_int64_t)pPredData;
     
-        sprintf( val, "%lld", pData->val );
+        sprintf( val, "%" G_GINT64_FORMAT, pData->val );
         strcat( sql, val );
     } else if( strcmp( pPredData->type_name, "double" ) == 0 ) {
         query_double_t pData = (query_double_t)pPredData;

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c	2007-12-09 04:21:19 UTC (rev 16625)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c	2007-12-09 04:21:23 UTC (rev 16626)
@@ -237,7 +237,7 @@
     } else {
         int_value = g_value_get_int( val );
     }
-    (*setter)( pObject, (gpointer)int_value );
+    (*setter)( pObject, GINT_TO_POINTER(int_value) );
 }
 
 static void
@@ -250,7 +250,7 @@
     memset( value, 0, sizeof( GValue ) );
 
     getter = get_getter( obj_name, table_row );
-    int_value = (gint)(*getter)( pObject, NULL );
+    int_value = GPOINTER_TO_INT((*getter)( pObject, NULL ));
     g_value_init( value, G_TYPE_INT );
     g_value_set_int( value, int_value );
 }

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c	2007-12-09 04:21:19 UTC (rev 16625)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c	2007-12-09 04:21:23 UTC (rev 16626)
@@ -123,14 +123,14 @@
 	
 	m = pInfo->pRecurrence->mult;
 
-    return (gpointer)m;
+    return GUINT_TO_POINTER(m);
 }
 
 static void
 set_recurrence_mult( gpointer pObject, gpointer pValue )
 {
     recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
-    guint m = (guint)pValue;
+    guint m = GPOINTER_TO_UINT(pValue);
 
     pInfo->pRecurrence->mult = m;
 }

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c	2007-12-09 04:21:19 UTC (rev 16625)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c	2007-12-09 04:21:23 UTC (rev 16626)
@@ -91,7 +91,7 @@
     gboolean autoNotify;
 
     xaccSchedXactionGetAutoCreate( pSx, &autoCreate, &autoNotify );
-    return (gpointer)autoCreate;
+    return GINT_TO_POINTER(autoCreate);
 }
 
 static void 
@@ -102,7 +102,7 @@
     gboolean autoNotify;
 
     xaccSchedXactionGetAutoCreate( pSx, &autoCreate, &autoNotify );
-    autoCreate = (gboolean)pValue;
+    autoCreate = GPOINTER_TO_INT(pValue);
     xaccSchedXactionSetAutoCreate( pSx, autoCreate, autoNotify );
 }
 
@@ -114,7 +114,7 @@
     gboolean autoNotify;
 
     xaccSchedXactionGetAutoCreate( pSx, &autoCreate, &autoNotify );
-    return (gpointer)autoNotify;
+    return GINT_TO_POINTER(autoNotify);
 }
 
 static void 
@@ -125,7 +125,7 @@
     gboolean autoNotify;
 
     xaccSchedXactionGetAutoCreate( pSx, &autoCreate, &autoNotify );
-    autoNotify = (gboolean)pValue;
+    autoNotify = GPOINTER_TO_INT(pValue);
     xaccSchedXactionSetAutoCreate( pSx, autoCreate, autoNotify );
 }