[taler-donau] branch master updated (03193a0 -> 7004a9f)

[gnunet]

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

grothoff pushed a change to branch master
in repository donau.

    from 03193a0  solve some errors
     new d78c046  fix build issues
     new 7004a9f  fix includes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac             |  1 +
 src/json/Makefile.am     |  2 +-
 src/pq/pq_query_helper.c | 20 +++++++++-----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index a6b34c3..fc880a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,6 +486,7 @@ AC_CONFIG_FILES([Makefile
                  src/donau-tools/Makefile
                  src/lib/Makefile
                  src/json/Makefile
+                 src/pq/Makefile
                  src/testing/Makefile
                  src/include/Makefile
                  src/util/Makefile
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
index 89dc4ff..1af3be5 100644
--- a/src/json/Makefile.am
+++ b/src/json/Makefile.am
@@ -17,7 +17,7 @@ libtalerjson_la_LDFLAGS = \
   -version-info 1:0:1 \
   -no-undefined
 libtalerjson_la_LIBADD = \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   -lgnunetjson \
   -lgnunetutil \
   -lunistring \
diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index dd6cf67..949c986 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -20,12 +20,10 @@
  * @author Florian Dold
  * @author Christian Grothoff
  */
-#include "platform.h"
 #include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_pq_lib.h>
-#include "taler_pq_lib.h"
-#include "pq_common.h"
+#include <taler/taler_pq_lib.h>
 
 
 /**
@@ -840,14 +838,14 @@ qconv_array (
   same_sized = (0 != meta->same_size);
 
 #define RETURN_UNLESS(cond) \
-        do { \
-          if (! (cond)) \
-          { \
-            GNUNET_break ((cond)); \
-            noerror = false; \
-            goto DONE; \
-          } \
-        } while (0)
+  do { \
+    if (! (cond)) \
+    { \
+      GNUNET_break ((cond)); \
+      noerror = false; \
+      goto DONE; \
+    } \
+  } while (0)
 
   /* Calculate sizes and check bounds */
   {

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