[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 2cc13e1b -fix FTBFS
2cc13e1b is described below

commit 2cc13e1b608a81a707c8d33486a9094d28401a3d
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Dec 28 18:45:10 2024 +0100

    -fix FTBFS
---
 src/backend/taler-merchant-httpd_contract.c | 6 +++++-
 src/include/taler_merchant_util.h           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_contract.c 
b/src/backend/taler-merchant-httpd_contract.c
index d7dcdcba..2d62b0bf 100644
--- a/src/backend/taler-merchant-httpd_contract.c
+++ b/src/backend/taler-merchant-httpd_contract.c
@@ -73,8 +73,10 @@ TMH_string_from_contract_output_type (enum 
TALER_MERCHANT_ContractOutputType t)
   {
   case TALER_MERCHANT_CONTRACT_OUTPUT_TYPE_TOKEN:
     return "token";
+#if FUTURE
   case TALER_MERCHANT_CONTRACT_OUTPUT_TYPE_COIN:
     return "coin";
+#endif
   case TALER_MERCHANT_CONTRACT_OUTPUT_TYPE_DONATION_RECEIPT:
     return "donation_receipt";
   default:
@@ -220,7 +222,9 @@ parse_choices (void *cls,
           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_uint32 ("key_index",
                                    &ki),
           GNUNET_JSON_spec_mark_optional (
diff --git a/src/include/taler_merchant_util.h 
b/src/include/taler_merchant_util.h
index 9243426e..dad4521d 100644
--- a/src/include/taler_merchant_util.h
+++ b/src/include/taler_merchant_util.h
@@ -206,7 +206,7 @@ struct TALER_MERCHANT_ContractOutput
       struct TALER_Amount amount;
 
       /**
-       * TODO: Check if this block is possible to opperate without default 
placeholder...
+       * TODO: Check if this block is possible to operate without default 
placeholder...
        * Is the donation receipt required?
        */
       bool receipt_required;

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