Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Moving winhttp.h instead of windows.h for MINGW build

This commit is contained in:
Veronica K. B. Olsen 2018-12-13 23:24:05 +01:00
parent 4f326368f4
commit 6fe171a2cd
No known key found for this signature in database
GPG Key ID: 3DA1732F448CE703
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/boinc_win.h
View File

@ -146,11 +146,6 @@
#define SECURITY_WIN32
#endif
/* MINGW needs windows.h before winhttp.h */
#ifdef __MINGW32__
#include <windows.h>
#endif
#if !defined(__CYGWIN32__) || defined(USE_WINSOCK)
/* If we're not running under CYGWIN use windows networking */
@ -162,9 +157,6 @@
#elif defined(HAVE_WINSOCK_H)
#include <winsock.h>
#endif
#ifdef HAVE_WINHTTP_H
#include <winhttp.h>
#endif
#ifndef HAVE_SOCKLEN_T
typedef size_t socklen_t;
@ -195,6 +187,9 @@ typedef size_t socklen_t;
#include <share.h>
#include <shlobj.h>
#include <userenv.h>
#ifdef HAVE_WINHTTP_H
#include <winhttp.h>
#endif
#include <aclapi.h>
#include <psapi.h>
#include <iphlpapi.h>