Seems I forgot one

On Thu, Dec 11, 2014 at 8:46 PM, Kai Tietz <[email protected]> wrote:

> Hi Martell,
>
> patch is ok
>
> Thanks,
> Kai
>
> 2014-12-11 19:49 GMT+01:00 Martell Malone <[email protected]>:
> > Find attached a more eye appealing patch for getacp and ipv6 wack 3.4
> fixes
> > Please review so I can commit
> >
> >
> > On Thu, Dec 4, 2014 at 5:33 PM, Martell Malone <[email protected]>
> > wrote:
> >>
> >> We shouldn't get 2 defines of it for desktop mode as there is a guard
> >> above
> >>
> >> #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
> >>
> >> and on the desktop one it is guarded by
> >>
> >> #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
> >>
> >> So we couldn't possibly get the definition twice.
> >>
> >>
> >> On Thu, Dec 4, 2014 at 5:29 PM, Kai Tietz <[email protected]>
> wrote:
> >>>
> >>> This looks wrong.  As for desktop-mode we now have two definitions if
> >>> WINSTORECOMPAT is defined.  So the other place of prototyping needs to
> >>> be guarded by '#ifndef WINSTORECOMPAT' for avoiding this
> >>> double-definition.
> >>>
> >>> Ok with that.
> >>>
> >>> Kai
> >>>
> >>> 2014-12-04 18:17 GMT+01:00 Martell Malone <[email protected]>:
> >>> > I hope this is okay.
> >>> > I would like to introduce prototypes for the emulated functions.
> >>> > Thoughts?
> >>> >
> >>> > From b943cf7d51aa7fcee6c64623a6cf0a8d5da7dcaa Mon Sep 17 00:00:00
> 2001
> >>> > From: Martell Malone <[email protected]>
> >>> > Date: Thu, 4 Dec 2014 17:14:55 +0000
> >>> > Subject: [PATCH] Introduce WINSTORECOMPAT guarded functions
> >>> >
> >>> > ---
> >>> >  mingw-w64-headers/include/winnls.h | 6 ++++++
> >>> >  1 file changed, 6 insertions(+)
> >>> >
> >>> > diff --git a/mingw-w64-headers/include/winnls.h
> >>> > b/mingw-w64-headers/include/winnls.h
> >>> > index d59c363..6d0f6be 100644
> >>> > --- a/mingw-w64-headers/include/winnls.h
> >>> > +++ b/mingw-w64-headers/include/winnls.h
> >>> > @@ -975,6 +975,12 @@ extern "C" {
> >>> >  #endif
> >>> >
> >>> >  #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
> >>> > +
> >>> > +#ifdef WINSTORECOMPAT
> >>> > +    WINBASEAPI UINT WINAPI GetACP (void);
> >>> > +#endif
> >>> > +
> >>> > +#endif
> >>> >    WINBASEAPI int WINAPI GetGeoInfoA (GEOID Location, GEOTYPE
> GeoType,
> >>> > LPSTR
> >>> > lpGeoData, int cchData, LANGID LangId);
> >>> >    WINBASEAPI int WINAPI GetGeoInfoW (GEOID Location, GEOTYPE
> GeoType,
> >>> > LPWSTR lpGeoData, int cchData, LANGID LangId);
> >>> >    WINBASEAPI WINBOOL WINAPI EnumSystemGeoID (GEOCLASS GeoClass,
> GEOID
> >>> > ParentGeoId, GEO_ENUMPROC lpGeoEnumProc);
> >>> > --
> >>> > 2.2.0
> >>> >
> >>> >
> >>> >
> >>> >
> ------------------------------------------------------------------------------
> >>> > Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> >>> > from Actuate! Instantly Supercharge Your Business Reports and
> >>> > Dashboards
> >>> > with Interactivity, Sharing, Native Excel Exports, App Integration &
> >>> > more
> >>> > Get technology previously reserved for billion-dollar corporations,
> >>> > FREE
> >>> >
> >>> >
> http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
> >>> > _______________________________________________
> >>> > Mingw-w64-public mailing list
> >>> > [email protected]
> >>> > https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
> >>> >
> >>>
> >>>
> >>>
> ------------------------------------------------------------------------------
> >>> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> >>> from Actuate! Instantly Supercharge Your Business Reports and
> Dashboards
> >>> with Interactivity, Sharing, Native Excel Exports, App Integration &
> more
> >>> Get technology previously reserved for billion-dollar corporations,
> FREE
> >>>
> >>>
> http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
> >>> _______________________________________________
> >>> Mingw-w64-public mailing list
> >>> [email protected]
> >>> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
> >>
> >>
> >
> >
> >
> ------------------------------------------------------------------------------
> > Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> > from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> > with Interactivity, Sharing, Native Excel Exports, App Integration & more
> > Get technology previously reserved for billion-dollar corporations, FREE
> >
> http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
> > _______________________________________________
> > Mingw-w64-public mailing list
> > [email protected]
> > https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
> >
>
>
> ------------------------------------------------------------------------------
> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> with Interactivity, Sharing, Native Excel Exports, App Integration & more
> Get technology previously reserved for billion-dollar corporations, FREE
>
> http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
> _______________________________________________
> Mingw-w64-public mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
>

Attachment: 0001-ws2ipdef-update-for-WACK-3.4.patch
Description: Binary data

------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to