From f619402cdaf2ee41de1d583b3e4c0b0a2f454925 Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Mon, 21 Oct 2002 04:13:32 +0000 Subject: [PATCH] * Peter O'Gorman's MacOS patch This is mostly just a bunch of libgncmod_name_LTX_ symbol changes to the modules. Also had to remove -Werror from hbci/Makefile.am due to darn cc warnings about order of includes. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7367 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 6 ++++ src/backend/file/gnc-backend-file.c | 4 ++- src/backend/file/gncmod-backend-file.c | 2 +- src/backend/postgres/PostgresBackend.c | 8 ++++-- .../postgres/gncmod-backend-postgres.c | 8 +++--- src/backend/rpc/gncmod-backend-rpc.c | 4 +-- src/business/business-core/businessmod-core.c | 22 +++++++++------ src/gnc-module/test/misc-mods/agedver.c | 20 +++++++------ src/gnc-module/test/misc-mods/futuremodsys.c | 19 ++++++++----- src/gnc-module/test/misc-mods/incompatdep.c | 18 +++++++----- src/gnc-module/test/mod-bar/gnc-mod-bar.c | 19 ++++++++----- src/gnc-module/test/mod-baz/gnc-mod-baz.c | 19 ++++++++----- src/gnc-module/test/mod-foo/gnc-mod-foo.c | 20 ++++++++----- src/import-export/gncmod-generic-import.c | 28 +++++++++++++------ src/import-export/hbci/Makefile.am | 2 +- src/import-export/hbci/gncmod-hbci.c | 28 +++++++++---------- src/import-export/ofx/gncmod-ofx-import.c | 28 +++++++++++++------ 17 files changed, 161 insertions(+), 94 deletions(-) diff --git a/ChangeLog b/ChangeLog index e00a2ab10b..4d60d576ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,12 @@ * dialog-options.c -- remove unused variable * gnc-regwidget.c -- remove unused (module) variable + * Peter O'Gorman's MacOS patch + This is mostly just a bunch of libgncmod_name_LTX_ symbol changes to + the modules. + Also had to remove -Werror from hbci/Makefile.am due to darn cc + warnings about order of includes. + 2002-10-20 Benoit Grégoire * Investment transactions now create two accounts, one is for the stock, the other is the account defined by the FI, where the cash is swaped. diff --git a/src/backend/file/gnc-backend-file.c b/src/backend/file/gnc-backend-file.c index 6c3f336b90..ec92a2df81 100644 --- a/src/backend/file/gnc-backend-file.c +++ b/src/backend/file/gnc-backend-file.c @@ -70,6 +70,8 @@ static void gnc_file_be_write_accounts_to_file(Backend *be, GNCBook *book); static void gnc_file_be_remove_old_files(FileBackend *be); +Backend * libgncmod_backend_file_LTX_gnc_backend_new(void); + void gnc_file_be_set_retention_days (int days) { @@ -178,7 +180,7 @@ file_sync_all(Backend* be, GNCBook *book) } Backend * -gnc_backend_new(void) +libgncmod_backend_file_LTX_gnc_backend_new(void) { FileBackend *fbe; Backend *be; diff --git a/src/backend/file/gncmod-backend-file.c b/src/backend/file/gncmod-backend-file.c index 560e895e86..4188a37b4f 100644 --- a/src/backend/file/gncmod-backend-file.c +++ b/src/backend/file/gncmod-backend-file.c @@ -19,7 +19,7 @@ int libgncmod_backend_file_LTX_gnc_module_current = 0; int libgncmod_backend_file_LTX_gnc_module_revision = 0; int libgncmod_backend_file_LTX_gnc_module_age = 0; -GNCModule engine; +static GNCModule engine; /* forward references */ char *libgncmod_backend_file_LTX_gnc_module_path(void); diff --git a/src/backend/postgres/PostgresBackend.c b/src/backend/postgres/PostgresBackend.c index 324ed81721..82b8e50d6a 100644 --- a/src/backend/postgres/PostgresBackend.c +++ b/src/backend/postgres/PostgresBackend.c @@ -33,8 +33,9 @@ #include #include #include +#if HAVE_LANGINFO_CODESET #include - +#endif #include #include "AccountP.h" @@ -2057,8 +2058,11 @@ pgend_session_begin (Backend *backend, if (FALSE == db_exists) { +#if HAVE_LANGINFO_CODESET char* encoding = nl_langinfo(CODESET); - +#else + char* encoding = "SQL_ASCII"; +#endif if (!strcmp (encoding, "ANSI_X3.4-1968")) encoding = "SQL_ASCII"; diff --git a/src/backend/postgres/gncmod-backend-postgres.c b/src/backend/postgres/gncmod-backend-postgres.c index 63c920119a..3dcfb74076 100644 --- a/src/backend/postgres/gncmod-backend-postgres.c +++ b/src/backend/postgres/gncmod-backend-postgres.c @@ -17,20 +17,20 @@ /* version of the gnc module system interface we require */ int libgncmod_backend_postgres_LTX_gnc_module_system_interface = 0; - +//int libgncmod_backend_postgres_LTX_gnc_module_system_interface = 0; /* module versioning uses libtool semantics. */ int libgncmod_backend_postgres_LTX_gnc_module_current = 0; int libgncmod_backend_postgres_LTX_gnc_module_revision = 0; int libgncmod_backend_postgres_LTX_gnc_module_age = 0; -GNCModule engine; +static GNCModule engine; /* forward references */ char *libgncmod_backend_postgres_LTX_gnc_module_path(void); char *libgncmod_backend_postgres_LTX_gnc_module_description(void); int libgncmod_backend_postgres_LTX_gnc_module_init(int refcount); int libgncmod_backend_postgres_LTX_gnc_module_end(int refcount); - +Backend * libgncmod_backend_postgres_LTX_gnc_backend_new(void); char * libgncmod_backend_postgres_LTX_gnc_module_path(void) @@ -77,6 +77,6 @@ libgncmod_backend_postgres_LTX_gnc_module_end(int refcount) ****************************************************************/ Backend * -gnc_backend_new(void) { +libgncmod_backend_postgres_LTX_gnc_backend_new(void) { return pgendNew(); } diff --git a/src/backend/rpc/gncmod-backend-rpc.c b/src/backend/rpc/gncmod-backend-rpc.c index 6065d38058..968760dfd1 100644 --- a/src/backend/rpc/gncmod-backend-rpc.c +++ b/src/backend/rpc/gncmod-backend-rpc.c @@ -30,7 +30,7 @@ char *libgncmod_backend_rpc_LTX_gnc_module_path(void); char *libgncmod_backend_rpc_LTX_gnc_module_description(void); int libgncmod_backend_rpc_LTX_gnc_module_init(int refcount); int libgncmod_backend_rpc_LTX_gnc_module_end(int refcount); - +Backend * libgncmod_backend_rpc_LTX_gnc_backend_new(void); char * libgncmod_backend_rpc_LTX_gnc_module_path(void) @@ -77,6 +77,6 @@ libgncmod_backend_rpc_LTX_gnc_module_end(int refcount) ****************************************************************/ Backend * -gnc_backend_new(void) { +libgncmod_backend_rpc_LTX_gnc_backend_new(void) { return rpcendNew(); } diff --git a/src/business/business-core/businessmod-core.c b/src/business/business-core/businessmod-core.c index f10f8b0ec6..05225c8d84 100644 --- a/src/business/business-core/businessmod-core.c +++ b/src/business/business-core/businessmod-core.c @@ -26,27 +26,33 @@ #include "gncVendorP.h" /* version of the gnc module system interface we require */ -int gnc_module_system_interface = 0; +int libgncmod_business_core_LTX_gnc_module_system_interface = 0; /* module versioning uses libtool semantics. */ -int gnc_module_current = 0; -int gnc_module_revision = 0; -int gnc_module_age = 0; +int libgncmod_business_core_LTX_gnc_module_current = 0; +int libgncmod_business_core_LTX_gnc_module_revision = 0; +int libgncmod_business_core_LTX_gnc_module_age = 0; + +/* forward references */ +char *libgncmod_business_core_LTX_gnc_module_path(void); +char *libgncmod_business_core_LTX_gnc_module_description(void); +int libgncmod_business_core_LTX_gnc_module_init(int refcount); +int libgncmod_business_core_LTX_gnc_module_end(int refcount); char * -gnc_module_path(void) +libgncmod_business_core_LTX_gnc_module_path(void) { return g_strdup("gnucash/business-core"); } char * -gnc_module_description(void) +libgncmod_business_core_LTX_gnc_module_description(void) { return g_strdup("The Gnucash business core"); } int -gnc_module_init(int refcount) +libgncmod_business_core_LTX_gnc_module_init(int refcount) { /* load the engine (we depend on it) */ if(!gnc_module_load("gnucash/engine", 0)) { @@ -76,7 +82,7 @@ gnc_module_init(int refcount) } int -gnc_module_end(int refcount) { +libgncmod_business_core_LTX_gnc_module_end(int refcount) { return TRUE; } diff --git a/src/gnc-module/test/misc-mods/agedver.c b/src/gnc-module/test/misc-mods/agedver.c index 9e6112519a..1396504fa8 100644 --- a/src/gnc-module/test/misc-mods/agedver.c +++ b/src/gnc-module/test/misc-mods/agedver.c @@ -6,24 +6,26 @@ #include "gnc-module.h" #include "gnc-module-api.h" -int gnc_module_system_interface = 0; - -int gnc_module_current = 12; -int gnc_module_age = 9; -int gnc_module_revision = 0; - +int libagedver_LTX_gnc_module_system_interface = 0; + +int libagedver_LTX_gnc_module_current = 12; +int libagedver_LTX_gnc_module_age = 9; +int libagedver_LTX_gnc_module_revision = 0; +char* libagedver_LTX_gnc_module_path(void); +char* libagedver_LTX_gnc_module_description(void); +int libagedver_LTX_gnc_module_init(int refcount); char * -gnc_module_path(void) { +libagedver_LTX_gnc_module_path(void) { return g_strdup("gnucash/agedver"); } char * -gnc_module_description(void) { +libagedver_LTX_gnc_module_description(void) { return g_strdup("this is a frequently extended module"); } int -gnc_module_init(int refcount) { +libagedver_LTX_gnc_module_init(int refcount) { return TRUE; } diff --git a/src/gnc-module/test/misc-mods/futuremodsys.c b/src/gnc-module/test/misc-mods/futuremodsys.c index cdaff95738..e24a69fd9d 100644 --- a/src/gnc-module/test/misc-mods/futuremodsys.c +++ b/src/gnc-module/test/misc-mods/futuremodsys.c @@ -8,24 +8,29 @@ #include "gnc-module-api.h" -int gnc_module_system_interface = 123456; +int libfuturemodsys_LTX_gnc_module_system_interface = 123456; + +int libfuturemodsys_LTX_gnc_module_current = 0; +int libfuturemodsys_LTX_gnc_module_age = 0; +int libfuturemodsys_LTX_gnc_module_revision = 0; + +char* libfuturemodsys_LTX_gnc_module_path(void); +char* libfuturemodsys_LTX_gnc_module_description(void); +int libfuturemodsys_LTX_gnc_module_init(int refcount); -int gnc_module_current = 0; -int gnc_module_age = 0; -int gnc_module_revision = 0; char * -gnc_module_path(void) { +libfuturemodsys_LTX_gnc_module_path(void) { return g_strdup("gnucash/futuremodsys"); } char * -gnc_module_description(void) { +libfuturemodsys_LTX_gnc_module_description(void) { return g_strdup("this is a broken future module"); } int -gnc_module_init(int refcount) { +libfuturemodsys_LTX_gnc_module_init(int refcount) { return TRUE; } diff --git a/src/gnc-module/test/misc-mods/incompatdep.c b/src/gnc-module/test/misc-mods/incompatdep.c index 1f7977b122..5dda702027 100644 --- a/src/gnc-module/test/misc-mods/incompatdep.c +++ b/src/gnc-module/test/misc-mods/incompatdep.c @@ -7,24 +7,28 @@ #include "gnc-module.h" #include "gnc-module-api.h" -int gnc_module_system_interface = 0; +int libincompatdep_LTX_gnc_module_system_interface = 0; -int gnc_module_current = 0; -int gnc_module_age = 0; -int gnc_module_revision = 0; +int libincompatdep_LTX_gnc_module_current = 0; +int libincompatdep_LTX_gnc_module_age = 0; +int libincompatdep_LTX_gnc_module_revision = 0; + +char *libincompatdep_LTX_gnc_module_path(void); +char *libincompatdep_LTX_gnc_module_description(void); +int libincompatdep_LTX_gnc_module_init(int refcount); char * -gnc_module_path(void) { +libincompatdep_LTX_gnc_module_path(void) { return g_strdup("gnucash/incompatdep"); } char * -gnc_module_description(void) { +libincompatdep_LTX_gnc_module_description(void) { return g_strdup("this is a broken module"); } int -gnc_module_init(int refcount) { +libincompatdep_LTX_gnc_module_init(int refcount) { if (gnc_module_load("gnucash/foo", 25)) { return TRUE; diff --git a/src/gnc-module/test/mod-bar/gnc-mod-bar.c b/src/gnc-module/test/mod-bar/gnc-mod-bar.c index 0b20893c95..2312522287 100644 --- a/src/gnc-module/test/mod-bar/gnc-mod-bar.c +++ b/src/gnc-module/test/mod-bar/gnc-mod-bar.c @@ -8,24 +8,29 @@ #include "bar-gwrap.h" #include "gnc-module-api.h" -int gnc_module_system_interface = 0; +int libgncmodbar_LTX_gnc_module_system_interface = 0; -int gnc_module_current = 0; -int gnc_module_age = 0; -int gnc_module_revision = 0; +int libgncmodbar_LTX_gnc_module_current = 0; +int libgncmodbar_LTX_gnc_module_age = 0; +int libgncmodbar_LTX_gnc_module_revision = 0; + +/* forward references */ +char *libgncmodbar_LTX_gnc_module_path(void); +char *libgncmodbar_LTX_gnc_module_description(void); +int libgncmodbar_LTX_gnc_module_init(int refcount); char * -gnc_module_path(void) { +libgncmodbar_LTX_gnc_module_path(void) { return g_strdup("gnucash/bar"); } char * -gnc_module_description(void) { +libgncmodbar_LTX_gnc_module_description(void) { return g_strdup("this is a bar module"); } int -gnc_module_init(int refcount) { +libgncmodbar_LTX_gnc_module_init(int refcount) { /* publish the g-wrapped Scheme bindings for libbar */ gw_init_wrapset_bar_gwrap(); diff --git a/src/gnc-module/test/mod-baz/gnc-mod-baz.c b/src/gnc-module/test/mod-baz/gnc-mod-baz.c index 066baf8236..084629420a 100644 --- a/src/gnc-module/test/mod-baz/gnc-mod-baz.c +++ b/src/gnc-module/test/mod-baz/gnc-mod-baz.c @@ -8,24 +8,29 @@ #include "gnc-module-api.h" #include "baz-gwrap.h" -int gnc_module_system_interface = 0; +int libgncmodbaz_LTX_gnc_module_system_interface = 0; -int gnc_module_current = 0; -int gnc_module_age = 0; -int gnc_module_revision = 0; +int libgncmodbaz_LTX_gnc_module_current = 0; +int libgncmodbaz_LTX_gnc_module_age = 0; +int libgncmodbaz_LTX_gnc_module_revision = 0; + +/* forward references */ +char *libgncmodbaz_LTX_gnc_module_path(void); +char *libgncmodbaz_LTX_gnc_module_description(void); +int libgncmodbaz_LTX_gnc_module_init(int refcount); char * -gnc_module_path(void) { +libgncmodbaz_LTX_gnc_module_path(void) { return g_strdup("gnucash/baz"); } char * -gnc_module_description(void) { +libgncmodbaz_LTX_gnc_module_description(void) { return g_strdup("this is the baz module"); } int -gnc_module_init(int refcount) { +libgncmodbaz_LTX_gnc_module_init(int refcount) { /* load libfoo */ if(gnc_module_load("gnucash/foo", 0)) { /* publish the g-wrapped Scheme bindings for libbaz */ diff --git a/src/gnc-module/test/mod-foo/gnc-mod-foo.c b/src/gnc-module/test/mod-foo/gnc-mod-foo.c index defd626c4b..ab08f79047 100644 --- a/src/gnc-module/test/mod-foo/gnc-mod-foo.c +++ b/src/gnc-module/test/mod-foo/gnc-mod-foo.c @@ -8,24 +8,30 @@ #include "foo-gwrap.h" #include "gnc-module-api.h" -int gnc_module_system_interface = 0; +int libgncmodfoo_LTX_gnc_module_system_interface = 0; + +int libgncmodfoo_LTX_gnc_module_current = 0; +int libgncmodfoo_LTX_gnc_module_age = 0; +int libgncmodfoo_LTX_gnc_module_revision = 0; + +/* forward references */ +char *libgncmodfoo_LTX_gnc_module_path(void); +char *libgncmodfoo_LTX_gnc_module_description(void); +int libgncmodfoo_LTX_gnc_module_init(int refcount); -int gnc_module_current = 0; -int gnc_module_age = 0; -int gnc_module_revision = 0; char * -gnc_module_path(void) { +libgncmodfoo_LTX_gnc_module_path(void) { return g_strdup("gnucash/foo"); } char * -gnc_module_description(void) { +libgncmodfoo_LTX_gnc_module_description(void) { return g_strdup("this is a foo module"); } int -gnc_module_init(int refcount) { +libgncmodfoo_LTX_gnc_module_init(int refcount) { /* publish the g-wrapped Scheme bindings for libfoo */ gw_init_wrapset_foo_gwrap(); diff --git a/src/import-export/gncmod-generic-import.c b/src/import-export/gncmod-generic-import.c index 1d1c21fab3..70e0e9c5c9 100644 --- a/src/import-export/gncmod-generic-import.c +++ b/src/import-export/gncmod-generic-import.c @@ -11,25 +11,35 @@ #include "gnc-module.h" #include "gnc-module-api.h" - /* version of the gnc module system interface we require */ -int gnc_module_system_interface = 0; +int libgncmod_generic_import_LTX_gnc_module_system_interface = 0; + /* module versioning uses libtool semantics. */ -int gnc_module_current = 0; -int gnc_module_revision = 0; -int gnc_module_age = 0; +int libgncmod_generic_import_LTX_gnc_module_current = 0; +int libgncmod_generic_import_LTX_gnc_module_revision = 0; +int libgncmod_generic_import_LTX_gnc_module_age = 0; + +static GNCModule engine; + +/* forward references */ +char *libgncmod_generic_import_LTX_gnc_module_path(void); +char *libgncmod_generic_import_LTX_gnc_module_description(void); +int libgncmod_generic_import_LTX_gnc_module_init(int refcount); +int libgncmod_generic_import_LTX_gnc_module_end(int refcount); + + char * -gnc_module_path(void) +libgncmod_generic_import_LTX_gnc_module_path(void) { return g_strdup("gnucash/import-export"); } char * -gnc_module_description(void) +libgncmod_generic_import_LTX_gnc_module_description(void) { return g_strdup("Gnome GUI and C code for the generic import functions"); } int -gnc_module_init(int refcount) +libgncmod_generic_import_LTX_gnc_module_init(int refcount) { if(!gnc_module_load("gnucash/engine", 0)) { @@ -47,7 +57,7 @@ gnc_module_init(int refcount) } int -gnc_module_end(int refcount) +libgncmod_generic_import_LTX_gnc_module_end(int refcount) { return TRUE; } diff --git a/src/import-export/hbci/Makefile.am b/src/import-export/hbci/Makefile.am index 62ea952589..01ac54e05b 100644 --- a/src/import-export/hbci/Makefile.am +++ b/src/import-export/hbci/Makefile.am @@ -58,7 +58,7 @@ AM_CFLAGS = \ ${GLADE_CFLAGS} \ ${GNOME_INCLUDEDIR} \ ${GTKHTML_CFLAGS} \ - ${HBCI_CFLAGS} -Werror + ${HBCI_CFLAGS} #gladedir = $(GNC_GLADE_DIR) #glade_DATA = diff --git a/src/import-export/hbci/gncmod-hbci.c b/src/import-export/hbci/gncmod-hbci.c index 0d0bcbb28f..a35d4a85bb 100644 --- a/src/import-export/hbci/gncmod-hbci.c +++ b/src/import-export/hbci/gncmod-hbci.c @@ -18,34 +18,34 @@ //#include "druid-hbci-final.h" /* version of the gnc module system interface we require */ -int gnc_module_system_interface = 0; +int libgncmod_hbci_LTX_gnc_module_system_interface = 0; /* module versioning uses libtool semantics. */ -int gnc_module_current = 0; -int gnc_module_revision = 0; -int gnc_module_age = 0; +int libgncmod_hbci_LTX_gnc_module_current = 0; +int libgncmod_hbci_LTX_gnc_module_revision = 0; +int libgncmod_hbci_LTX_gnc_module_age = 0; /* forward references */ -char *gnc_module_path(void); -char *gnc_module_description(void); -int gnc_module_init(int refcount); -int gnc_module_end(int refcount); +char *libgncmod_hbci_LTX_gnc_module_path(void); +char *libgncmod_hbci_LTX_gnc_module_description(void); +int libgncmod_hbci_LTX_gnc_module_init(int refcount); +int libgncmod_hbci_LTX_gnc_module_end(int refcount); -void gnc_hbci_addmenus(void); +static void gnc_hbci_addmenus(void); char * -gnc_module_path(void) { +libgncmod_hbci_LTX_gnc_module_path(void) { return g_strdup("gnucash/import-export/hbci"); } char * -gnc_module_description(void) { +libgncmod_hbci_LTX_gnc_module_description(void) { return g_strdup("Support for HBCI protocol"); } int -gnc_module_init(int refcount) +libgncmod_hbci_LTX_gnc_module_init(int refcount) { /* load the engine (we depend on it) */ if(!gnc_module_load("gnucash/engine", 0)) { @@ -81,11 +81,11 @@ gnc_module_init(int refcount) } int -gnc_module_end(int refcount) { +libgncmod_hbci_LTX_gnc_module_end(int refcount) { return TRUE; } -void +static void gnc_hbci_addmenus(void) { static GnomeUIInfo reg_online_submenu[] = diff --git a/src/import-export/ofx/gncmod-ofx-import.c b/src/import-export/ofx/gncmod-ofx-import.c index e13ae9d5f1..d6ece13be6 100644 --- a/src/import-export/ofx/gncmod-ofx-import.c +++ b/src/import-export/ofx/gncmod-ofx-import.c @@ -13,23 +13,35 @@ #include "gnc-module-api.h" /* version of the gnc module system interface we require */ -int gnc_module_system_interface = 0; +int libgncmod_ofx_LTX_gnc_module_system_interface = 0; + /* module versioning uses libtool semantics. */ -int gnc_module_current = 0; -int gnc_module_revision = 0; -int gnc_module_age = 0; +int libgncmod_ofx_LTX_gnc_module_current = 0; +int libgncmod_ofx_LTX_gnc_module_revision = 0; +int libgncmod_ofx_LTX_gnc_module_age = 0; + +static GNCModule bus_core; +static GNCModule file; + +/* forward references */ +char *libgncmod_ofx_LTX_gnc_module_path(void); +char *libgncmod_ofx_LTX_gnc_module_description(void); +int libgncmod_ofx_LTX_gnc_module_init(int refcount); +int libgncmod_ofx_LTX_gnc_module_end(int refcount); + + char * -gnc_module_path(void) +libgncmod_ofx_LTX_gnc_module_path(void) { return g_strdup("gnucash/import-export/ofx"); } char * -gnc_module_description(void) +libgncmod_ofx_LTX_gnc_module_description(void) { return g_strdup("Gnome GUI and C code for OFX importer using libofx"); } int -gnc_module_init(int refcount) +libgncmod_ofx_LTX_gnc_module_init(int refcount) { if(!gnc_module_load("gnucash/engine", 0)) { @@ -53,7 +65,7 @@ gnc_module_init(int refcount) } int -gnc_module_end(int refcount) +libgncmod_ofx_LTX_gnc_module_end(int refcount) { return TRUE; }