[Gnucash-changes] QOF sync

[Neil Williams]

Log Message:
-----------
QOF sync

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/engine/test:
        test-book-merge.c

Revision Data
-------------
Index: test-book-merge.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/test-book-merge.c,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -Lsrc/engine/test/test-book-merge.c -Lsrc/engine/test/test-book-merge.c -u -r1.2.2.5 -r1.2.2.6
--- src/engine/test/test-book-merge.c
+++ src/engine/test/test-book-merge.c
@@ -23,17 +23,13 @@
  /* Test the qof_book_merge infrastructure. */
  
 #include <glib.h>
-#include <libguile.h>
+
 #define _GNU_SOURCE
 
-#include "qofinstance-p.h"
-#include "gnc-module.h"
-#include "gnc-event-p.h"
 #include "qof.h"
-#include "qof_book_merge.h"
 #include "test-stuff.h"
-
 #include "gnc-engine.h"
+
 #define TEST_MODULE_NAME "book-merge-test"
 #define TEST_MODULE_DESC "Test Book Merge"
 #define OBJ_NAME "somename"
@@ -469,19 +465,13 @@
 	do_test ((rule->mergeResult != MERGE_REPORT), "update result fail");
 }
 
-static void
-main_helper (void *closure, int argc, char **argv)
+int
+main (int argc, char **argv)
 {
 	gnc_engine_init(argc, argv);
 	myobjRegister();
 	test_merge();
 	print_test_results();
 	exit(get_rv());
-}
-
-int
-main (int argc, char **argv)
-{
-	scm_boot_guile (argc, argv, main_helper, NULL);
 	return 0;
 }