From 031384db3488ee673c3ad730240bd9aa6a8eb52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=C3=B6hler?= <andi5.py@gmx.net>
Date: Sun, 9 Dec 2007 04:21:23 +0000
Subject: [PATCH] Fix compilation on 64-bit platforms.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gda-dev@16626 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/backend/gda/gnc-backend-gda.c      | 2 +-
 src/backend/gda/gnc-backend-util-gda.c | 4 ++--
 src/backend/gda/gnc-recurrence-gda.c   | 4 ++--
 src/backend/gda/gnc-schedxaction-gda.c | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/backend/gda/gnc-backend-gda.c b/src/backend/gda/gnc-backend-gda.c
index a6f845150c..7280f3f61b 100644
--- a/src/backend/gda/gnc-backend-gda.c
+++ b/src/backend/gda/gnc-backend-gda.c
@@ -711,7 +711,7 @@ handle_and_term( QofQueryTerm* pTerm, gchar* sql )
     } 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;
diff --git a/src/backend/gda/gnc-backend-util-gda.c b/src/backend/gda/gnc-backend-util-gda.c
index cb73884aee..330e0b649e 100644
--- a/src/backend/gda/gnc-backend-util-gda.c
+++ b/src/backend/gda/gnc-backend-util-gda.c
@@ -237,7 +237,7 @@ load_int( GdaDataModel* pModel, gint row,
     } 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 @@ get_gvalue_int( GncGdaBackend* be, QofIdTypeConst obj_name,
     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 );
 }
diff --git a/src/backend/gda/gnc-recurrence-gda.c b/src/backend/gda/gnc-recurrence-gda.c
index f9573c0ee2..9361e75834 100644
--- a/src/backend/gda/gnc-recurrence-gda.c
+++ b/src/backend/gda/gnc-recurrence-gda.c
@@ -123,14 +123,14 @@ get_recurrence_mult( gpointer pObject, const QofParam* param )
 	
 	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;
 }
diff --git a/src/backend/gda/gnc-schedxaction-gda.c b/src/backend/gda/gnc-schedxaction-gda.c
index b8a13143b7..afad85779c 100644
--- a/src/backend/gda/gnc-schedxaction-gda.c
+++ b/src/backend/gda/gnc-schedxaction-gda.c
@@ -91,7 +91,7 @@ get_autocreate( gpointer pObject, const QofParam* param )
     gboolean autoNotify;
 
     xaccSchedXactionGetAutoCreate( pSx, &autoCreate, &autoNotify );
-    return (gpointer)autoCreate;
+    return GINT_TO_POINTER(autoCreate);
 }
 
 static void 
@@ -102,7 +102,7 @@ set_autocreate( gpointer pObject, gpointer pValue )
     gboolean autoNotify;
 
     xaccSchedXactionGetAutoCreate( pSx, &autoCreate, &autoNotify );
-    autoCreate = (gboolean)pValue;
+    autoCreate = GPOINTER_TO_INT(pValue);
     xaccSchedXactionSetAutoCreate( pSx, autoCreate, autoNotify );
 }
 
@@ -114,7 +114,7 @@ get_autonotify( gpointer pObject, const QofParam* param )
     gboolean autoNotify;
 
     xaccSchedXactionGetAutoCreate( pSx, &autoCreate, &autoNotify );
-    return (gpointer)autoNotify;
+    return GINT_TO_POINTER(autoNotify);
 }
 
 static void 
@@ -125,7 +125,7 @@ set_autonotify( gpointer pObject, gpointer pValue )
     gboolean autoNotify;
 
     xaccSchedXactionGetAutoCreate( pSx, &autoCreate, &autoNotify );
-    autoNotify = (gboolean)pValue;
+    autoNotify = GPOINTER_TO_INT(pValue);
     xaccSchedXactionSetAutoCreate( pSx, autoCreate, autoNotify );
 }