summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-12-12 13:46:11 +0100
committerChristian Grothoff <christian@grothoff.org>2015-12-12 13:46:11 +0100
commitf4b5ccdd0183a1b6f4d3c34b6390804eb05c2478 (patch)
treebeb372def38ed6d1d6547b47ab24dd8040cac473 /src/include
parent39f27765a28dd4c04842085fc1928d5e0d5a33be (diff)
downloadmerchant-f4b5ccdd0183a1b6f4d3c34b6390804eb05c2478.tar.gz
merchant-f4b5ccdd0183a1b6f4d3c34b6390804eb05c2478.tar.bz2
merchant-f4b5ccdd0183a1b6f4d3c34b6390804eb05c2478.zip
add missing configure checks for libgnurl and coverage:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/Makefile.am3
-rw-r--r--src/include/taler_merchant_service.h44
2 files changed, 24 insertions, 23 deletions
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 77977b5f..f62655b3 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -5,4 +5,5 @@ EXTRA_DIST = \
talerincludedir = $(includedir)/taler
talerinclude_HEADERS = \
- taler_merchantdb_lib.h
+ taler_merchantdb_lib.h \
+ taler_merchant_service.h
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index a9decdc2..5b612f73 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -185,17 +185,17 @@ struct TALER_MERCHANT_PayCoin
* @return a handle for this request
*/
struct TALER_MERCHANT_Pay *
-TALER_MERCHANT_pay (struct TALER_MERCHANT_Context *merchant,
- const struct GNUNET_HashCode *h_wire,
- const struct GNUNET_HashCode *h_contract,
- struct GNUNET_TIME_Absolute timestamp,
- uint64_t transaction_id,
- const struct TALER_MerchantPublicKeyP *merchant_pub,
- struct GNUNET_TIME_Absolute refund_deadline,
- unsigned int num_coins,
- const struct TLAER_MERCHANT_PayCoin *coins,
- TALER_MERCHANT_PayCallback pay_cb,
- void *pay_cb_cls);
+TALER_MERCHANT_pay_wallet (struct TALER_MERCHANT_Context *merchant,
+ const struct GNUNET_HashCode *h_wire,
+ const struct GNUNET_HashCode *h_contract,
+ struct GNUNET_TIME_Absolute timestamp,
+ uint64_t transaction_id,
+ const struct TALER_MerchantPublicKeyP *merchant_pub,
+ struct GNUNET_TIME_Absolute refund_deadline,
+ unsigned int num_coins,
+ const struct TLAER_MERCHANT_PayCoin *coins,
+ TALER_MERCHANT_PayCallback pay_cb,
+ void *pay_cb_cls);
/**
@@ -258,17 +258,17 @@ struct TALER_MERCHANT_PaidCoin
* @return a handle for this request
*/
struct TALER_MERCHANT_Pay *
-TALER_MERCHANT_pay2 (struct TALER_MERCHANT_Context *merchant,
- const struct GNUNET_HashCode *h_wire,
- const struct GNUNET_HashCode *h_contract,
- struct GNUNET_TIME_Absolute timestamp,
- uint64_t transaction_id,
- const struct TALER_MerchantPublicKeyP *merchant_pub,
- struct GNUNET_TIME_Absolute refund_deadline,
- unsigned int num_coins,
- const struct TALER_MERCHANT_PaidCoin *coins,
- TALER_MERCHANT_PayCallback pay_cb,
- void *pay_cb_cls);
+TALER_MERCHANT_pay_frontend (struct TALER_MERCHANT_Context *merchant,
+ const struct GNUNET_HashCode *h_wire,
+ const struct GNUNET_HashCode *h_contract,
+ struct GNUNET_TIME_Absolute timestamp,
+ uint64_t transaction_id,
+ const struct TALER_MerchantPublicKeyP *merchant_pub,
+ struct GNUNET_TIME_Absolute refund_deadline,
+ unsigned int num_coins,
+ const struct TALER_MERCHANT_PaidCoin *coins,
+ TALER_MERCHANT_PayCallback pay_cb,
+ void *pay_cb_cls);
/**