diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-10-15 03:14:23 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-10-15 03:14:23 +0200 |
| commit | 9f8b9743f382ee627439634369788489248c9a41 (patch) | |
| tree | 01299695ad9601a3c3e75bd40249880ef163db22 /src/include/taler_merchantdb_plugin.h | |
| parent | ff8fdfa0ec4f617993d385bb4258fb0538156c20 (diff) | |
| parent | 521aa89e5bca18cab12d8872bfccea5de11f48ce (diff) | |
| download | merchant-9f8b9743f382ee627439634369788489248c9a41.tar.gz merchant-9f8b9743f382ee627439634369788489248c9a41.tar.bz2 merchant-9f8b9743f382ee627439634369788489248c9a41.zip | |
resolving merge conflict with Marcello, mostly exactly the same changes
Diffstat (limited to 'src/include/taler_merchantdb_plugin.h')
| -rw-r--r-- | src/include/taler_merchantdb_plugin.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index 4d711377..92375fb2 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -285,12 +285,11 @@ struct TALER_MERCHANTDB_Plugin * #GNUNET_SYSERR on hard errors */ int - (*find_payments_by_id) (void *cls, - uint64_t transaction_id, - const struct TALER_MerchantPublicKeyP *merchant_pub, - TALER_MERCHANTDB_CoinDepositCallback cb, - void *cb_cls); - + (*find_payments) (void *cls, + uint64_t transaction_id, + const struct TALER_MerchantPublicKeyP *merchant_pub, + TALER_MERCHANTDB_CoinDepositCallback cb, + void *cb_cls); /** * Lookup information about coin payments by transaction ID and coin. |