diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-06-03 17:00:53 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-06-03 17:00:53 +0200 |
| commit | 6ab85b2097891daf6fd3fecc5a1901d4782ebf36 (patch) | |
| tree | d3b8c42e6518948a0952dd37c7664f5cb9e7ac41 | |
| parent | 506da5872bfda9a5c782a8e3af7386e396d9f8a4 (diff) | |
| parent | d6e97fb555a0e84c82aa18861cf606eeefae6fa3 (diff) | |
| download | merchant-6ab85b2097891daf6fd3fecc5a1901d4782ebf36.tar.gz merchant-6ab85b2097891daf6fd3fecc5a1901d4782ebf36.tar.bz2 merchant-6ab85b2097891daf6fd3fecc5a1901d4782ebf36.zip | |
Merge branch 'master' of git.taler.net:/var/git/merchant
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 978a3942..0785d635 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -489,6 +489,7 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *config) { char *wireformat; + int fh; wireformat = NULL; result = GNUNET_SYSERR; @@ -621,7 +622,6 @@ run (void *cls, struct sockaddr_un *un; char *mode; struct GNUNET_NETWORK_Handle *nh; - int fh; if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (config, |