diff options
Diffstat (limited to 'src/backend')
7 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index cce7faec..c9c408de 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -1,5 +1,5 @@ # This Makefile.am is in the public domain -AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/backend-lib/ +AM_CPPFLAGS = -I$(top_srcdir)/src/include if USE_COVERAGE AM_CFLAGS = --coverage -O0 diff --git a/src/backend/taler-merchant-httpd_config.c b/src/backend/taler-merchant-httpd_config.c index 10f0cd39..96394198 100644 --- a/src/backend/taler-merchant-httpd_config.c +++ b/src/backend/taler-merchant-httpd_config.c @@ -23,6 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> #include "taler-merchant-httpd.h" +#include "taler-merchant-httpd_config.h" #include "taler-merchant-httpd_mhd.h" #include "taler-merchant-httpd_exchanges.h" @@ -77,7 +78,7 @@ add_exchange (void *cls, MHD_RESULT -MH_handler_config (struct TMH_RequestHandler *rh, +MH_handler_config (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) { diff --git a/src/backend/taler-merchant-httpd_get-templates-ID.c b/src/backend/taler-merchant-httpd_get-templates-ID.c index a2ad9bff..6b39496c 100644 --- a/src/backend/taler-merchant-httpd_get-templates-ID.c +++ b/src/backend/taler-merchant-httpd_get-templates-ID.c @@ -19,7 +19,7 @@ * @author Priscilla HUANG */ #include "platform.h" -#include "taler-merchant-httpd_private-get-templates-ID.h" +#include "taler-merchant-httpd_get-templates-ID.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c index 9af2c8f8..69a9d2b6 100644 --- a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c +++ b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c @@ -455,9 +455,8 @@ ekr_finished (struct ExchangeKycRequest *ekr) after we asked at the exchanges => 204 */ struct MHD_Response *response; - response = MHD_create_response_from_buffer (0, - "", - MHD_RESPMEM_PERSISTENT); + response = MHD_create_response_from_buffer_static (0, + ""); resume_kyc_with_response (kc, MHD_HTTP_NO_CONTENT, response); diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c b/src/backend/taler-merchant-httpd_private-get-orders.c index 3e60c153..13afee0a 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders.c +++ b/src/backend/taler-merchant-httpd_private-get-orders.c @@ -503,7 +503,7 @@ resume_by_event (void *cls, GNUNET_break (0); return; } - osf = (enum TMH_OrderStateFlags) ntohl (oce->order_state); + osf = (enum TMH_OrderStateFlags) (int) ntohl (oce->order_state); order_serial_id = GNUNET_ntohll (oce->order_serial_id); date = GNUNET_TIME_timestamp_ntoh (oce->execution_date); GNUNET_log (GNUNET_ERROR_TYPE_INFO, diff --git a/src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c b/src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c index cb64d607..46afefad 100644 --- a/src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c +++ b/src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c @@ -16,14 +16,13 @@ License along with TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ - /** * @file taler-merchant-httpd_private-patch-orders-ID-forget.c * @brief implementing PATCH /orders/$ORDER_ID/forget request handling * @author Jonathan Buchanan */ #include "platform.h" -#include "taler-merchant-httpd_private-patch-instances-ID.h" +#include "taler-merchant-httpd_private-patch-orders-ID-forget.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_spa.c b/src/backend/taler-merchant-httpd_spa.c index b12200b8..4fc64042 100644 --- a/src/backend/taler-merchant-httpd_spa.c +++ b/src/backend/taler-merchant-httpd_spa.c @@ -23,6 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_mhd_lib.h> #include "taler-merchant-httpd_statics.h" +#include "taler-merchant-httpd_spa.h" #include <gnunet/gnunet_mhd_compat.h> |