aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-10-20 11:05:54 +0200
committerChristian Grothoff <christian@grothoff.org>2018-10-20 11:05:54 +0200
commit0cf6311163538de04a9746e0a5fe747ab7dd2dcc (patch)
tree341736bf6787f1ab214e759aef8331dd9c7e6c16 /src
parentd53a20b13a01ccb64a0f8b48caa47c0066e8143a (diff)
downloadgnunet-0cf6311163538de04a9746e0a5fe747ab7dd2dcc.tar.gz
gnunet-0cf6311163538de04a9746e0a5fe747ab7dd2dcc.zip
fix include order
Diffstat (limited to 'src')
-rw-r--r--src/gns/gnunet-gns-proxy.c8
-rw-r--r--src/util/crypto_hkdf.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index d66f5c658..a9013390e 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -11,7 +11,7 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17*/ 17*/
@@ -788,7 +788,7 @@ cleanup_s5r (struct Socks5Request *s5r)
788 s5r->rtask = NULL; 788 s5r->rtask = NULL;
789 } 789 }
790 if (NULL != s5r->timeout_task) 790 if (NULL != s5r->timeout_task)
791 { 791 {
792 GNUNET_SCHEDULER_cancel (s5r->timeout_task); 792 GNUNET_SCHEDULER_cancel (s5r->timeout_task);
793 s5r->timeout_task = NULL; 793 s5r->timeout_task = NULL;
794 } 794 }
@@ -918,7 +918,7 @@ mhd_content_cb (void *cls,
918 "Continuing CURL interaction for %s%s\n", 918 "Continuing CURL interaction for %s%s\n",
919 s5r->domain, 919 s5r->domain,
920 s5r->url); 920 s5r->url);
921 s5r->curl_paused = GNUNET_NO; 921 s5r->curl_paused = GNUNET_NO;
922 curl_easy_pause (s5r->curl, 922 curl_easy_pause (s5r->curl,
923 CURLPAUSE_CONT); 923 CURLPAUSE_CONT);
924 } 924 }
@@ -1461,7 +1461,7 @@ curl_upload_cb (void *buf,
1461 s5r->curl_paused = GNUNET_NO; 1461 s5r->curl_paused = GNUNET_NO;
1462 curl_easy_pause (s5r->curl, 1462 curl_easy_pause (s5r->curl,
1463 CURLPAUSE_CONT); 1463 CURLPAUSE_CONT);
1464 } 1464 }
1465 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1465 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1466 "Completed CURL UPLOAD %s%s\n", 1466 "Completed CURL UPLOAD %s%s\n",
1467 s5r->domain, 1467 s5r->domain,
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c
index 6dae13840..5ed22269f 100644
--- a/src/util/crypto_hkdf.c
+++ b/src/util/crypto_hkdf.c
@@ -52,8 +52,8 @@
52 52
53#if GNUNET_BUILD 53#if GNUNET_BUILD
54#include "platform.h" 54#include "platform.h"
55#include "benchmark.h"
56#include "gnunet_crypto_lib.h" 55#include "gnunet_crypto_lib.h"
56#include "benchmark.h"
57#else 57#else
58#define GNUNET_NO 0 58#define GNUNET_NO 0
59#define GNUNET_YES 1 59#define GNUNET_YES 1