From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Sun, 8 Jul 2018 14:49:21 +0000 (+0200)
Subject: curl_setup: include <winerror.h> before <windows.h>
X-Git-Tag: curl-7_61_0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8272ec50f02bd5277bdad09a98ddfc8c6d68a979;p=thirdparty%2Fcurl.git

curl_setup: include <winerror.h> before <windows.h>

Otherwise, only part of it gets pulled in through <windows.h> on
original MinGW.

Fixes https://github.com/curl/curl/issues/2361
Closes https://github.com/curl/curl/pull/2721
---

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 9696a07d08..7c8518174b 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -1,4 +1,4 @@
-#ifndef HEADER_CURL_SETUP_H
+#ifndef HEADER_CURL_SETUP_H
 #define HEADER_CURL_SETUP_H
 /***************************************************************************
  *                                  _   _ ____  _
@@ -242,6 +242,7 @@
 #  if defined(_UNICODE) && !defined(UNICODE)
 #    define UNICODE
 #  endif
+#  include <winerror.h>
 #  include <windows.h>
 #  ifdef HAVE_WINSOCK2_H
 #    include <winsock2.h>