[Gnucash-changes] Fix compilation breakage.
David Hampton
hampton at cvs.gnucash.org
Sat Oct 1 18:42:56 EDT 2005
Log Message:
-----------
Fix compilation breakage.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/backend/postgres:
PostgresBackend.c
PostgresBackend.h
account.c
book.c
builder.c
checkpoint.c
escape.c
events.c
gncquery.c
kvp-sql.c
price.c
putil.c
txn.c
txnmass.c
upgrade.c
gnucash/src/backend/postgres/test:
test-db.c
gnucash/src/engine:
gnc-trace.h
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.297
retrieving revision 1.1487.2.298
diff -LChangeLog -LChangeLog -u -r1.1487.2.297 -r1.1487.2.298
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,7 @@
2005-10-01 David Hampton <hampton at employees.org>
+ * src/backend/postgres/*:
+ * src/engine/gnc-trace.h:
* src/gnome-utils/gnc-html-graph-gog.c:
* src/gnome-utils/gnc-plugin.c:
* src/import-export/hbci/gnc-plugin-hbci.c: Fix compilation
Index: price.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/price.c,v
retrieving revision 1.17.4.6
retrieving revision 1.17.4.7
diff -Lsrc/backend/postgres/price.c -Lsrc/backend/postgres/price.c -u -r1.17.4.6 -r1.17.4.7
--- src/backend/postgres/price.c
+++ src/backend/postgres/price.c
@@ -46,7 +46,7 @@
#include "price.h"
#include "putil.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
/* ============================================================= */
/* ============================================================= */
Index: upgrade.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/upgrade.c,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -Lsrc/backend/postgres/upgrade.c -Lsrc/backend/postgres/upgrade.c -u -r1.12.4.2 -r1.12.4.3
--- src/backend/postgres/upgrade.c
+++ src/backend/postgres/upgrade.c
@@ -36,7 +36,7 @@
#include "putil.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
/* ============================================================= */
Index: book.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/book.c,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -Lsrc/backend/postgres/book.c -Lsrc/backend/postgres/book.c -u -r1.6.4.4 -r1.6.4.5
--- src/backend/postgres/book.c
+++ src/backend/postgres/book.c
@@ -46,7 +46,7 @@
#include "putil.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
/* ============================================================= */
/* ============================================================= */
Index: account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/account.c,v
retrieving revision 1.23.4.2
retrieving revision 1.23.4.3
diff -Lsrc/backend/postgres/account.c -Lsrc/backend/postgres/account.c -u -r1.23.4.2 -r1.23.4.3
--- src/backend/postgres/account.c
+++ src/backend/postgres/account.c
@@ -51,7 +51,7 @@
#include "PostgresBackend.h"
#include "price.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
#include "putil.h"
Index: escape.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/escape.c,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -Lsrc/backend/postgres/escape.c -Lsrc/backend/postgres/escape.c -u -r1.3.4.2 -r1.3.4.3
--- src/backend/postgres/escape.c
+++ src/backend/postgres/escape.c
@@ -34,10 +34,11 @@
#include <glib.h>
#include <string.h>
+#include "gnc-engine.h"
#include "gnc-engine-util.h"
#include "escape.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
/* ================================================ */
Index: txn.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/txn.c,v
retrieving revision 1.23.4.4
retrieving revision 1.23.4.5
diff -Lsrc/backend/postgres/txn.c -Lsrc/backend/postgres/txn.c -u -r1.23.4.4 -r1.23.4.5
--- src/backend/postgres/txn.c
+++ src/backend/postgres/txn.c
@@ -37,6 +37,7 @@
#include "Group.h"
#include "GroupP.h"
#include "gnc-commodity.h"
+#include "gnc-engine.h"
#include "gnc-engine-util.h"
#include "gnc-event.h"
#include "gnc-pricedb.h"
@@ -54,7 +55,7 @@
#include "putil.h"
-static short module = MOD_TXN;
+static QofLogModule log_module = GNC_MOD_TXN;
/* ============================================================= */
/* ============================================================= */
Index: PostgresBackend.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/PostgresBackend.h,v
retrieving revision 1.8.4.2
retrieving revision 1.8.4.3
diff -Lsrc/backend/postgres/PostgresBackend.h -Lsrc/backend/postgres/PostgresBackend.h -u -r1.8.4.2 -r1.8.4.3
--- src/backend/postgres/PostgresBackend.h
+++ src/backend/postgres/PostgresBackend.h
@@ -44,6 +44,8 @@
#include "qofbackend-p.h"
#include "qofbook.h"
+#define GNC_MOD_TXN "gnucash-postgres-transaction"
+
typedef struct _pgend PGBackend;
typedef enum {
Index: gncquery.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/gncquery.c,v
retrieving revision 1.29.4.5
retrieving revision 1.29.4.6
diff -Lsrc/backend/postgres/gncquery.c -Lsrc/backend/postgres/gncquery.c -u -r1.29.4.5 -r1.29.4.6
--- src/backend/postgres/gncquery.c
+++ src/backend/postgres/gncquery.c
@@ -55,7 +55,7 @@
#include "builder.h"
#include "escape.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
struct _gnc_query {
Index: txnmass.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/txnmass.c,v
retrieving revision 1.14.4.4
retrieving revision 1.14.4.5
diff -Lsrc/backend/postgres/txnmass.c -Lsrc/backend/postgres/txnmass.c -u -r1.14.4.4 -r1.14.4.5
--- src/backend/postgres/txnmass.c
+++ src/backend/postgres/txnmass.c
@@ -37,6 +37,7 @@
#include "Group.h"
#include "GroupP.h"
#include "gnc-commodity.h"
+#include "gnc-engine.h"
#include "gnc-engine-util.h"
#include "gnc-event.h"
#include "guid.h"
@@ -52,7 +53,7 @@
#include "putil.h"
-static short module = MOD_TXN;
+static QofLogModule log_module = GNC_MOD_TXN;
/* ============================================================= */
Index: putil.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/putil.c,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -Lsrc/backend/postgres/putil.c -Lsrc/backend/postgres/putil.c -u -r1.2.4.2 -r1.2.4.3
--- src/backend/postgres/putil.c
+++ src/backend/postgres/putil.c
@@ -41,7 +41,7 @@
#include "gnc-engine-util.h"
#include "PostgresBackend.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
#include "putil.h"
Index: builder.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/builder.c,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -Lsrc/backend/postgres/builder.c -Lsrc/backend/postgres/builder.c -u -r1.3.6.3 -r1.3.6.4
--- src/backend/postgres/builder.c
+++ src/backend/postgres/builder.c
@@ -45,9 +45,10 @@
#include "gnc-date.h"
#include "escape.h"
#include "builder.h"
+#include "gnc-engine.h"
#include "gnc-engine-util.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
/* ================================================ */
Index: checkpoint.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/checkpoint.c,v
retrieving revision 1.9.4.4
retrieving revision 1.9.4.5
diff -Lsrc/backend/postgres/checkpoint.c -Lsrc/backend/postgres/checkpoint.c -u -r1.9.4.4 -r1.9.4.5
--- src/backend/postgres/checkpoint.c
+++ src/backend/postgres/checkpoint.c
@@ -58,7 +58,7 @@
#include "putil.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
/* ============================================================= */
/* include autogenerated code */
Index: kvp-sql.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/kvp-sql.c,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -Lsrc/backend/postgres/kvp-sql.c -Lsrc/backend/postgres/kvp-sql.c -u -r1.13.2.3 -r1.13.2.4
--- src/backend/postgres/kvp-sql.c
+++ src/backend/postgres/kvp-sql.c
@@ -38,12 +38,13 @@
#include <string.h>
#include "escape.h"
+#include "gnc-engine.h"
#include "gnc-engine-util.h"
#include "kvp-sql.h"
#include "PostgresBackend.h"
#include "putil.h"
-static short module = MOD_KVP;
+static QofLogModule log_module = QOF_MOD_KVP;
/* =========================================================== */
/* get a unique iguid index */
Index: PostgresBackend.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/PostgresBackend.c,v
retrieving revision 1.43.4.6
retrieving revision 1.43.4.7
diff -Lsrc/backend/postgres/PostgresBackend.c -Lsrc/backend/postgres/PostgresBackend.c -u -r1.43.4.6 -r1.43.4.7
--- src/backend/postgres/PostgresBackend.c
+++ src/backend/postgres/PostgresBackend.c
@@ -72,7 +72,7 @@
#include "txnmass.h"
#include "upgrade.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
#include "putil.h"
Index: events.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/events.c,v
retrieving revision 1.13.4.3
retrieving revision 1.13.4.4
diff -Lsrc/backend/postgres/events.c -Lsrc/backend/postgres/events.c -u -r1.13.4.3 -r1.13.4.4
--- src/backend/postgres/events.c
+++ src/backend/postgres/events.c
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include "events.h"
+#include "gnc-engine.h"
#include "gnc-engine-util.h"
#include "gnc-event.h"
#include "gnc-event-p.h"
@@ -43,7 +44,7 @@
#include "putil.h"
#include "txn.h"
-static short module = MOD_EVENT;
+static QofLogModule log_module = "gnucash-postgres-event";
/* ============================================================= */
Index: test-db.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/test/test-db.c,v
retrieving revision 1.49.4.2
retrieving revision 1.49.4.3
diff -Lsrc/backend/postgres/test/test-db.c -Lsrc/backend/postgres/test/test-db.c -u -r1.49.4.2 -r1.49.4.3
--- src/backend/postgres/test/test-db.c
+++ src/backend/postgres/test/test-db.c
@@ -21,7 +21,7 @@
#include "test-stuff.h"
#include "test-engine-stuff.h"
-static short module = MOD_TEST;
+static QofLogModule log_module = GNC_MOD_TEST;
struct _dbinfo {
char *host;
@@ -494,7 +494,7 @@
be = (PGBackend *) qof_session_get_backend(session);
- if (gnc_should_log(module, GNC_LOG_DETAIL))
+ if (gnc_should_log(log_module, GNC_LOG_DETAIL))
qof_query_print(qn);
sq = sqlQuery_new();
Index: gnc-trace.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-trace.h,v
retrieving revision 1.3.4.9
retrieving revision 1.3.4.10
diff -Lsrc/engine/gnc-trace.h -Lsrc/engine/gnc-trace.h -u -r1.3.4.9 -r1.3.4.10
--- src/engine/gnc-trace.h
+++ src/engine/gnc-trace.h
@@ -235,21 +235,21 @@
/** start a particular timer */
#define START_CLOCK(clockno,format, args...) { \
if (gnc_should_log (log_module, GNC_LOG_INFO)) \
- gnc_start_clock (clockno, module, GNC_LOG_INFO, \
+ gnc_start_clock (clockno, log_module, GNC_LOG_INFO, \
__FUNCTION__, format , ## args); \
}
/** report elapsed time since last report on a particular timer */
#define REPORT_CLOCK(clockno,format, args...) { \
if (gnc_should_log (log_module, GNC_LOG_INFO)) \
- gnc_report_clock (clockno, module, GNC_LOG_INFO, \
+ gnc_report_clock (clockno, log_module, GNC_LOG_INFO, \
__FUNCTION__, format , ## args); \
}
/** report total elapsed time since timer started */
#define REPORT_CLOCK_TOTAL(clockno,format, args...) { \
if (gnc_should_log (log_module, GNC_LOG_INFO)) \
- gnc_report_clock_total (clockno, module, GNC_LOG_INFO, \
+ gnc_report_clock_total (clockno, log_module, GNC_LOG_INFO, \
__FUNCTION__, format , ## args); \
}
More information about the gnucash-changes
mailing list