From: Brad King <brad.king@kitware.com>
Date: Wed, 16 Feb 2022 12:31:56 +0000 (-0500)
Subject: windows: include archive_platform.h first in blake2s sources
X-Git-Tag: v3.6.1~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1670%2Fhead;p=thirdparty%2Flibarchive.git

windows: include archive_platform.h first in blake2s sources

Move the inclusion added by commit 90978db1 (windows: make sure we use
the right calling convention for libc, 2021-10-13, v3.6.0~39^2~1) to be
first.  This is our convention in all other `.c` sources.  It ensures
that our configured `_WIN32_WINNT` value is defined before including any
system headers.
---

diff --git a/libarchive/archive_blake2s_ref.c b/libarchive/archive_blake2s_ref.c
index b21a02ba6..93d328118 100644
--- a/libarchive/archive_blake2s_ref.c
+++ b/libarchive/archive_blake2s_ref.c
@@ -13,11 +13,12 @@
    https://blake2.net.
 */
 
+#include "archive_platform.h"
+
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
 
-#include "archive_platform.h"
 #include "archive_blake2.h"
 #include "archive_blake2_impl.h"
 
diff --git a/libarchive/archive_blake2sp_ref.c b/libarchive/archive_blake2sp_ref.c
index f412c8e2a..b913a4db6 100644
--- a/libarchive/archive_blake2sp_ref.c
+++ b/libarchive/archive_blake2sp_ref.c
@@ -13,6 +13,8 @@
    https://blake2.net.
 */
 
+#include "archive_platform.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -21,7 +23,6 @@
 #include <omp.h>
 #endif
 
-#include "archive_platform.h"
 #include "archive_blake2.h"
 #include "archive_blake2_impl.h"