summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-04-24 03:26:00 +0200
committerChristian Grothoff <christian@grothoff.org>2016-04-24 03:26:00 +0200
commit2cf860f09c28cbbdfd0b66176f4f0bd93a184048 (patch)
tree39de75c2f326130a77550dc18511bbe59a25bbef
parentf9441ca8541756e454a6560f8f7dc11afd8b300c (diff)
downloadmerchant-2cf860f09c28cbbdfd0b66176f4f0bd93a184048.tar.gz
merchant-2cf860f09c28cbbdfd0b66176f4f0bd93a184048.tar.bz2
merchant-2cf860f09c28cbbdfd0b66176f4f0bd93a184048.zip
fix const causing ftbfs
m---------examples/blog/web-common0
m---------examples/shop/web-common0
-rw-r--r--src/backend/taler-merchant-httpd_pay.c4
-rw-r--r--src/backenddb/plugin_merchantdb_postgres.c2
-rw-r--r--src/include/taler_merchantdb_plugin.h2
5 files changed, 4 insertions, 4 deletions
diff --git a/examples/blog/web-common b/examples/blog/web-common
-Subproject 026ef2476676ef00b6c2a0cec135a8e64024ee5
+Subproject eb164f4a0ba56bb1232052b5cde19014fca70ed
diff --git a/examples/shop/web-common b/examples/shop/web-common
-Subproject 026ef2476676ef00b6c2a0cec135a8e64024ee5
+Subproject eb164f4a0ba56bb1232052b5cde19014fca70ed
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
index 7dc93db2..3745f2ce 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -277,7 +277,7 @@ abort_deposit (struct PayContext *pc)
static void
deposit_cb (void *cls,
unsigned int http_status,
- json_t *proof)
+ const json_t *proof)
{
struct MERCHANT_DepositConfirmation *dc = cls;
struct PayContext *pc = dc->pc;
@@ -423,7 +423,7 @@ process_pay_with_exchange (void *cls,
const struct TALER_EXCHANGE_DenomPublicKey *denom_details;
denom_details = TALER_EXCHANGE_get_denomination_key (keys,
- &dc->denom);
+ &dc->denom);
if (NULL == denom_details)
{
GNUNET_break_op (0);
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 6306d637..d437d8e8 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -152,7 +152,7 @@ postgres_store_payment (void *cls,
struct GNUNET_TIME_Absolute refund,
const struct TALER_Amount *amount_without_fee,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
- json_t *exchange_proof)
+ const json_t *exchange_proof)
{
struct PostgresClosure *pg = cls;
PGresult *res;
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 85d8168c..ee978ea5 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -82,7 +82,7 @@ struct TALER_MERCHANTDB_Plugin
struct GNUNET_TIME_Absolute refund,
const struct TALER_Amount *amount_without_fee,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
- json_t *exchange_proof);
+ const json_t *exchange_proof);
/**
* Check whether a payment has already been stored