[libgda] Adaptations for Windows compilation

[Vivien Malerba <vivien src gnome org>]

commit 51aa7670e6f300033136a1177c1cb14bb189c6bd
Author: Vivien Malerba <malerba gnome-db org>
Date:   Tue May 20 22:08:03 2014 +0200

    Adaptations for Windows compilation

 libgda/gda-connection.c               |    6 +++---
 libgda/libgda.symbols                 |    4 +++-
 libgda/sqlite/sqlite-src/PragmasPatch |    2 +-
 libgda/sqlite/sqlite-src/sqlite3.c    |    2 +-
 providers/sqlcipher/sqlcipher.patch   |    2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/libgda/gda-connection.c b/libgda/gda-connection.c
index ad80c42..8c59009 100644
--- a/libgda/gda-connection.c
+++ b/libgda/gda-connection.c
@@ -145,7 +145,7 @@ static void update_meta_store_after_statement_exec (GdaConnection *cnc, GdaState
 static void change_events_array_max_size (GdaConnection *cnc, gint size);
 
 enum {
-       ERROR,
+       SIG_ERROR,
        OPENED,
         CLOSED,
        DSN_CHANGED,
@@ -220,7 +220,7 @@ gda_connection_class_init (GdaConnectionClass *klass)
         * Gets emitted whenever a connection event occurs. Check the nature of @event to
         * see if it's an error or a simple notification
         */
-       gda_connection_signals[ERROR] =
+       gda_connection_signals[SIG_ERROR] =
                g_signal_new ("error",
                              G_TYPE_FROM_CLASS (object_class),
                              G_SIGNAL_RUN_LAST,
@@ -2557,7 +2557,7 @@ gda_connection_add_event (GdaConnection *cnc, GdaConnectionEvent *event)
        }
 
        if (gda_connection_event_get_event_type (event) == GDA_CONNECTION_EVENT_ERROR)
-               g_signal_emit (G_OBJECT (cnc), gda_connection_signals[ERROR], 0, event);
+               g_signal_emit (G_OBJECT (cnc), gda_connection_signals[SIG_ERROR], 0, event);
 
 #ifdef GDA_DEBUG_NO
        dump_events_array (cnc);
diff --git a/libgda/libgda.symbols b/libgda/libgda.symbols
index aef05d4..8255782 100644
--- a/libgda/libgda.symbols
+++ b/libgda/libgda.symbols
@@ -978,10 +978,12 @@
        gda_vprovider_hub_new
        gda_worker_cancel_job
        gda_worker_do_job
+       gda_worker_error_quark
        gda_worker_fetch_job_result
        gda_worker_forget_job
-       gda_worker_kill
+       gda_worker_get_worker_thread
        gda_worker_new
+       gda_worker_new_unique
        gda_worker_ref
        gda_worker_set_callback
        gda_worker_submit_job
diff --git a/libgda/sqlite/sqlite-src/PragmasPatch b/libgda/sqlite/sqlite-src/PragmasPatch
index 2763f3e..c751e28 100644
--- a/libgda/sqlite/sqlite-src/PragmasPatch
+++ b/libgda/sqlite/sqlite-src/PragmasPatch
@@ -7,7 +7,7 @@
 +static char *gdauniqueFuncName (FuncDef *func)
 +{
 +      char *sname;
-+      uint order = 0;
++      unsigned int order = 0;
 +      FuncDef *n;
 +      int size;
 +      for (n = func->pNext; n; n = n->pNext)
diff --git a/libgda/sqlite/sqlite-src/sqlite3.c b/libgda/sqlite/sqlite-src/sqlite3.c
index 3dce7a6..c9900d5 100644
--- a/libgda/sqlite/sqlite-src/sqlite3.c
+++ b/libgda/sqlite/sqlite-src/sqlite3.c
@@ -97534,7 +97534,7 @@ SQLITE_PRIVATE const char *sqlite3JournalModename(int eMode){
 static char *gdauniqueFuncName (FuncDef *func)
 {
        char *sname;
-       uint order = 0;
+       unsigned int order = 0;
        FuncDef *n;
        int size;
        for (n = func->pNext; n; n = n->pNext)
diff --git a/providers/sqlcipher/sqlcipher.patch b/providers/sqlcipher/sqlcipher.patch
index e821333..43d867c 100644
--- a/providers/sqlcipher/sqlcipher.patch
+++ b/providers/sqlcipher/sqlcipher.patch
@@ -10051,7 +10051,7 @@
 -static char *gdauniqueFuncName (FuncDef *func)
 -{
 -      char *sname;
--      uint order = 0;
+-      unsigned int order = 0;
 -      FuncDef *n;
 -      int size;
 -      for (n = func->pNext; n; n = n->pNext)