[taler-donau] branch master updated: fix link order magic

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new 5b8a02d  fix link order magic
5b8a02d is described below

commit 5b8a02d94f9415533b68b89bb04479f302b52f7b
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jan 12 17:44:12 2024 +0100

    fix link order magic
---
 contrib/gana                          |  2 +-
 src/donaudb/Makefile.am               | 15 ++++++++-------
 src/donaudb/plugin_donaudb_postgres.c | 16 ++++++++--------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 40f6cf1..8368009 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 40f6cf1015231663064eda98aa1e403cddd7b970
+Subproject commit 836800945d80db9c0160a10a84edc1a086339187
diff --git a/src/donaudb/Makefile.am b/src/donaudb/Makefile.am
index 15f2afe..282383a 100644
--- a/src/donaudb/Makefile.am
+++ b/src/donaudb/Makefile.am
@@ -65,7 +65,6 @@ plugin_LTLIBRARIES = \
   libtaler_plugin_donaudb_postgres.la
 endif
 
-
 libtaler_plugin_donaudb_postgres_la_SOURCES = \
   plugin_donaudb_postgres.c pg_helper.h \
   pg_preflight.h pg_preflight.c \
@@ -90,19 +89,21 @@ libtaler_plugin_donaudb_postgres_la_SOURCES = \
   pg_insert_history_entry.h pg_insert_history_entry.c \
   pg_insert_issued_receipt.h pg_insert_issued_receipt.c \
   pg_insert_submitted_receipt.h pg_insert_submitted_receipt.c
-  
+
+
 libtaler_plugin_donaudb_postgres_la_LIBADD = \
   $(LTLIBINTL)
 libtaler_plugin_donaudb_postgres_la_LDFLAGS = \
-  $(TALER_PLUGIN_LDFLAGS) \
+  $(TALER_PLUGIN_LDFLAGS)  \
   $(top_builddir)/src/util/libdonauutil.la \
-  -lpq \
-  -lpthread \
+  -ltalerjson \
+  -ltalerutil \
   -lgnunetpq \
   -lgnunetutil \
-  -ljansson \
-  -ltalerjson \
+  -lpq \
   -ltalerpq \
+  -ljansson \
+  -lpthread \
   $(XLIB)
 
 lib_LTLIBRARIES = \
diff --git a/src/donaudb/plugin_donaudb_postgres.c 
b/src/donaudb/plugin_donaudb_postgres.c
index 65a24e7..6386d15 100644
--- a/src/donaudb/plugin_donaudb_postgres.c
+++ b/src/donaudb/plugin_donaudb_postgres.c
@@ -75,14 +75,14 @@
  * @param conn SQL connection that was used
  */
 #define BREAK_DB_ERR(result,conn) do {                                  \
-          GNUNET_break (0);                                                   \
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                                \
-                      "Database failure: %s/%s/%s/%s/%s",                     \
-                      PQresultErrorField (result, PG_DIAG_MESSAGE_PRIMARY),   \
-                      PQresultErrorField (result, PG_DIAG_MESSAGE_DETAIL),    \
-                      PQresultErrorMessage (result),                          \
-                      PQresStatus (PQresultStatus (result)),                  \
-                      PQerrorMessage (conn));                                 \
+    GNUNET_break (0);                                                   \
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                                \
+                "Database failure: %s/%s/%s/%s/%s",                     \
+                PQresultErrorField (result, PG_DIAG_MESSAGE_PRIMARY),   \
+                PQresultErrorField (result, PG_DIAG_MESSAGE_DETAIL),    \
+                PQresultErrorMessage (result),                          \
+                PQresStatus (PQresultStatus (result)),                  \
+                PQerrorMessage (conn));                                 \
 } while (0)
 
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.