[Libwebsockets] [libwebsockets] Various Windows Cleanup (#95)

Andy Green andy at warmcat.com
Sun Mar 30 04:17:49 CEST 2014


On 03/29/2014 03:31 PM, Patrick Gansterer wrote:
>
> Would be great if you could keep the commits separated when merging 
> into master.
>

OK.  Github offers me a single patch for the delta in these notification 
emails.

I guess if there's more than one bulletpoint in this "commit summary" it 
means there is really more than one patch, so in that case I will merge 
as done this time.

In return, it's helpful if you can start your commit message with 
"windows", "wince" or whatever.

Thanks for the nice cleanup.

-Andy

> ------------------------------------------------------------------------
>
>
>         You can merge this Pull Request by running
>
>    git pull https://github.com/paroga/libwebsockets w32
>
> Or view, comment on, or merge it at:
>
> https://github.com/warmcat/libwebsockets/pull/95
>
>
>         Commit Summary
>
>   * Remove emulated_poll on Windows
>   * Remove dummy headers for Windows
>   * Use Sleep() instead of usleep() on Windows
>   * Remove unreferenced local variable on Windows
>   * Move #define for random() into the test applications where needed
>   * Remove websock-w32.h
>
>
>         File Changes
>
>   * *M* CMakeLists.txt
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-0> (45)
>   * *M* lib/client-handshake.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-1> (2)
>   * *M* lib/client.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-2> (2)
>   * *M* lib/libwebsockets.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-3> (33)
>   * *M* lib/libwebsockets.h
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-4> (12)
>   * *M* lib/private-libwebsockets.h
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-5> (14)
>   * *M* lib/server.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-6> (2)
>   * *M* test-server/test-client.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-7> (7)
>   * *M* test-server/test-echo.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-8> (10)
>   * *M* test-server/test-fraggle.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-9> (7)
>   * *M* test-server/test-ping.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-10> (12)
>   * *M* test-server/test-server.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-11> (26)
>   * *D* win32port/win32helpers/netdb.h
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-12> (1)
>   * *D* win32port/win32helpers/strings.h
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-13> (0)
>   * *D* win32port/win32helpers/sys/time.h
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-14> (1)
>   * *D* win32port/win32helpers/unistd.h
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-15> (0)
>   * *D* win32port/win32helpers/websock-w32.c
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-16>
>     (103)
>   * *D* win32port/win32helpers/websock-w32.h
>     <https://github.com/warmcat/libwebsockets/pull/95/files#diff-17> (65)
>
>
>         Patch Links:
>
>   * https://github.com/warmcat/libwebsockets/pull/95.patch
>   * https://github.com/warmcat/libwebsockets/pull/95.diff
>
>> Reply to this email directly or view it on GitHub 
> <https://github.com/warmcat/libwebsockets/pull/95>.
>




More information about the Libwebsockets mailing list