[Gnucash-changes] Karl Hegbloom's fixes to suppress compiler warnings on amd64.

[David Hampton]

Log Message:
-----------
Karl Hegbloom's fixes to suppress compiler warnings on amd64.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
    gnucash/src/backend/postgres:
        kvp-sql.c
        price.c
        putil.h
        upgrade.c

Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.366
retrieving revision 1.1487.2.367
diff -LChangeLog -LChangeLog -u -r1.1487.2.366 -r1.1487.2.367
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,14 @@
+2005-11-01  Karl Hegbloom  <hegbloom at pdx.edu>
+
+        * src/backend/postgres/upgrade.c:
+        * src/backend/postgres/price.c: Use glib
+        * src/backend/postgres/base-autogen.c:
+        * src/backend/postgres/kvp-sql.c: Use glib macros for type
+	conversions to suppress compiler warnings on amd64.
+
+        * src/backend/postgres/putil.h: Cast fun to long long int to
+	suppress compiler warning on amd64.
+
 2005-10-31  David Hampton  <hampton at employees.org>
 
 	* macros/autogen.sh: Remove obsolete warning about gettext.
Index: price.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/price.c,v
retrieving revision 1.17.4.8
retrieving revision 1.17.4.9
diff -Lsrc/backend/postgres/price.c -Lsrc/backend/postgres/price.c -u -r1.17.4.8 -r1.17.4.9
--- src/backend/postgres/price.c
+++ src/backend/postgres/price.c
@@ -197,7 +197,7 @@
 static gboolean
 commodity_mark_cb (gnc_commodity *cm, gpointer user_data)
 {
-   gint32 v = ((gint32) user_data) & 0xffff;
+   gint32 v = ((gint32) GPOINTER_TO_INT(user_data)) & 0xffff;
    gnc_commodity_set_mark (cm, (gint16) v);
    return TRUE;
 }
Index: upgrade.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/upgrade.c,v
retrieving revision 1.12.4.3
retrieving revision 1.12.4.4
diff -Lsrc/backend/postgres/upgrade.c -Lsrc/backend/postgres/upgrade.c -u -r1.12.4.3 -r1.12.4.4
--- src/backend/postgres/upgrade.c
+++ src/backend/postgres/upgrade.c
@@ -126,7 +126,7 @@
 get_iguid_cb (PGBackend *be, PGresult *result, int j, gpointer data)
 {
    int fin = atoi(DB_GET_VAL ("iguid", j));
-   return (gpointer) fin;
+   return GINT_TO_POINTER(fin);
 }
 
 
@@ -150,7 +150,7 @@
 
    p = "SELECT iguid FROM gncGUIDCache ORDER BY iguid DESC LIMIT 1;";
    SEND_QUERY (be,p, );
-   iguid = (guint32) pgendGetResults (be, get_iguid_cb, 0);
+   iguid = (guint32) GPOINTER_TO_UINT(pgendGetResults (be, get_iguid_cb, 0));
    iguid ++;
 
    sprintf(buff, "CREATE SEQUENCE gnc_iguid_seq START %d;", iguid);
Index: putil.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/putil.h,v
retrieving revision 1.10.4.6
retrieving revision 1.10.4.7
diff -Lsrc/backend/postgres/putil.h -Lsrc/backend/postgres/putil.h -u -r1.10.4.6 -r1.10.4.7
--- src/backend/postgres/putil.h
+++ src/backend/postgres/putil.h
@@ -318,7 +318,7 @@
 #define COMP_INT64(sqlname,fun,ndiffs) { 			\
    if (strtoll (DB_GET_VAL(sqlname,0), NULL, 0) != fun) {	\
       PINFO("mis-match: %s sql='%s', eng='%lld'", sqlname, 	\
-         DB_GET_VAL (sqlname,0), fun); 				\
+	 DB_GET_VAL (sqlname,0), (long long int) fun);	\
       ndiffs++; 						\
    }								\
 }
Index: kvp-sql.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/kvp-sql.c,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -Lsrc/backend/postgres/kvp-sql.c -Lsrc/backend/postgres/kvp-sql.c -u -r1.13.2.5 -r1.13.2.6
--- src/backend/postgres/kvp-sql.c
+++ src/backend/postgres/kvp-sql.c
@@ -121,7 +121,7 @@
 ival_cb (PGBackend *be, PGresult *result, int j, gpointer data)
 {
   int ival = atoi (DB_GET_VAL ("ipath", 0));
-  return (gpointer) ival;
+  return GINT_TO_POINTER(ival);
 }
 
 
@@ -143,7 +143,7 @@
    p = stpcpy (p, "';");
 
    SEND_QUERY (be,be->buff, 0);
-   ival = (int) pgendGetResults (be, ival_cb, (gpointer) 0);
+   ival = GPOINTER_TO_INT(pgendGetResults (be, ival_cb, (gpointer) 0));
    if (ival) return ival;
 
    /* Else, this guid has never been stored before.