[taler-merchant] branch master updated: -fix ftbfs

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 7d2f5ba0 -fix ftbfs
7d2f5ba0 is described below

commit 7d2f5ba035349f45ea5e54be02be651b377c68cc
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Dec 28 18:49:20 2024 +0100

    -fix ftbfs
---
 src/backend/taler-merchant-httpd_private-post-orders.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c 
b/src/backend/taler-merchant-httpd_private-post-orders.c
index 1ce2de5f..e21ab2c8 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -2022,6 +2022,7 @@ output_contract_choices (struct OrderContext *oc)
                                   output->details.token.key_index)
           );
         break;
+#if FUTURE
       case TALER_MERCHANT_CONTRACT_OUTPUT_TYPE_COIN:
         /* Not implemented, how did we get here? */
         GNUNET_break (0);
@@ -2031,6 +2032,7 @@ output_contract_choices (struct OrderContext *oc)
                           "currency conversion not supported");
         json_decref (choices);
         return NULL;
+#endif
       case TALER_MERCHANT_CONTRACT_OUTPUT_TYPE_DONATION_RECEIPT:
         // FIXME: generate JSON for DONAU here instead of killing
         // the connection!
@@ -3554,7 +3556,9 @@ parse_order_outputs (struct OrderContext *oc,
       GNUNET_JSON_spec_string ("kind",
                                &kind),
       GNUNET_JSON_spec_string ("token_family_slug",
-                               &output.details.token.token_family_slug),
+                               // FIXME...
+                               (const char **) &output.details.token.
+                               token_family_slug),
       GNUNET_JSON_spec_mark_optional (
         GNUNET_JSON_spec_uint32 ("count",
                                  &output.details.token.count),

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