On Fri, Jun 17, 2016, at 12:40 PM, Kai Tietz wrote: > Hi, > > patch looks fine to me. As I can't test in more detail, patch is ok, > if there are no objections within today. > > Regards, > Kai > > > 2016-06-17 12:27 GMT+02:00 Hugo Beauzée-Luyssen <[email protected]>: > > --- > > mingw-w64-headers/include/iphlpapi.h | 6 +++++- > > mingw-w64-headers/include/iprtrmib.h | 5 +++++ > > mingw-w64-headers/include/mprapi.h | 6 ++++++ > > mingw-w64-headers/include/nldef.h | 2 +- > > 4 files changed, 17 insertions(+), 2 deletions(-) > > > > diff --git a/mingw-w64-headers/include/iphlpapi.h > > b/mingw-w64-headers/include/iphlpapi.h > > index 03aed33..b28df42 100644 > > --- a/mingw-w64-headers/include/iphlpapi.h > > +++ b/mingw-w64-headers/include/iphlpapi.h > > @@ -8,7 +8,7 @@ > > > > #include <winapifamily.h> > > > > -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= > > 0x0A00 > > > > #ifdef __cplusplus > > extern "C" { > > @@ -19,6 +19,8 @@ extern "C" { > > #include <iptypes.h> > > #include <tcpestats.h> > > > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > > + > > DWORD WINAPI GetNumberOfInterfaces (PDWORD pdwNumIf); > > DWORD WINAPI GetIfEntry (PMIB_IFROW pIfRow); > > DWORD WINAPI GetIfTable (PMIB_IFTABLE pIfTable, PULONG pdwSize, WINBOOL > > bOrder); > > @@ -94,6 +96,8 @@ extern "C" { > > ULONG WINAPI GetAdaptersInfo (PIP_ADAPTER_INFO AdapterInfo, PULONG > > SizePointer); > > PIP_ADAPTER_ORDER_MAP WINAPI GetAdapterOrderMap (VOID); > > > > +#endif > > + > > #ifdef _WINSOCK2API_ > > ULONG WINAPI GetAdaptersAddresses (ULONG Family, ULONG Flags, PVOID > > Reserved, PIP_ADAPTER_ADDRESSES AdapterAddresses, PULONG SizePointer); > > #endif > > diff --git a/mingw-w64-headers/include/iprtrmib.h > > b/mingw-w64-headers/include/iprtrmib.h > > index 93e0cad..65ca264 100644 > > --- a/mingw-w64-headers/include/iprtrmib.h > > +++ b/mingw-w64-headers/include/iprtrmib.h > > @@ -6,6 +6,9 @@ > > #ifndef __ROUTING_IPRTRMIB_H__ > > #define __ROUTING_IPRTRMIB_H__ > > > > +#include <winapifamily.h> > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > > + > > #include <mprapi.h> > > #include <ipmib.h> > > #include <ipifcons.h> > > @@ -772,4 +775,6 @@ typedef enum _TCPIP_OWNER_MODULE_INFO_CLASS { > > > > #define CAST_MIB_INFO(X,Y,Z) Z = (Y)(X->rgbyData) > > > > +#endif /*WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)*/ > > + > > #endif /* __ROUTING_IPRTRMIB_H__ */ > > diff --git a/mingw-w64-headers/include/mprapi.h > > b/mingw-w64-headers/include/mprapi.h > > index 2103c2b..7bbc1d7 100644 > > --- a/mingw-w64-headers/include/mprapi.h > > +++ b/mingw-w64-headers/include/mprapi.h > > @@ -9,6 +9,10 @@ > > #include <lmcons.h> > > #include <ras.h> > > > > +#include <winapifamily.h> > > + > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > > + > > #ifdef __cplusplus > > extern "C" { > > #endif > > @@ -991,4 +995,6 @@ DWORD APIENTRY MprAdminServerSetInfoEx( > > } > > #endif > > > > +#endif /* WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) */ > > + > > #endif /* __ROUTING_MPRADMIN_H__ */ > > diff --git a/mingw-w64-headers/include/nldef.h > > b/mingw-w64-headers/include/nldef.h > > index 5a6a767..e61f104 100644 > > --- a/mingw-w64-headers/include/nldef.h > > +++ b/mingw-w64-headers/include/nldef.h > > @@ -7,7 +7,7 @@ > > #define _NLDEF_ > > #include <winapifamily.h> > > > > -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= > > 0x0A00 > > > > typedef enum { > > NldsInvalid, > > -- > > 2.8.1 > >
Turns out conditionally including files (which content doesn't depend on the partition) was a bad idea. Updated patch sent. -- Hugo Beauzée-Luyssen [email protected] ------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports. http://sdm.link/zohomanageengine _______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
