[Privoxy-devel] Git merges on master

[Fabian Keil]

Lee <ler762 at gmail.com> wrote on 2020-12-20:

> On 12/20/20, Fabian Keil <fk at fabiankeil.de> wrote:
> > Fabian Keil <fk at fabiankeil.de> wrote on 2020-12-14:
> >
> >> Lee <ler762 at gmail.com> wrote on 2020-12-14:
> >
> >> > but I've never noticed anything showing up on privoxy.org/gitweb/
> >> > before.
> >> >
> >> > Did I actually change anything & if so, how do I undo it?
> >>
> >> It looks like you indeed pushed merge commits although I
> >> think this required additional steps ...
> >>
> >> I think with the right git commands involving "git push --force"
> >> we could remove them again but this will inconvenience everyone who
> >> already pulled.
> >>
> >> Reverting 867cd1d8 (if it should not be in master yet) will
> >> keep the somewhat ugly history but is probably sufficient.
> 
> That would be this
> $ git log 867cd1d8
> commit 867cd1d8d3a03442c86036fed101c6fcf6c7fd04
> Author: Lee <ler762 at users.sourceforge.net>
> Date:   Mon Dec 14 09:11:30 2020 -0500
> 
>     fix compiler warnings about including winsock2.h before windows.h
> 
> correct?

Correct.

> > Do you still get the warnings you silenced in 867cd1d8 with
> > the attached patch?
> 
> No warnings - with or without the -std=c99 gcc option.

Great. Thanks for testing. Pushed to master.

Fabian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.privoxy.org/pipermail/privoxy-devel/attachments/20201221/7a97c1e5/attachment.bin>