[zeromq-dev] [PATCH] zmq: Fix includes when cross-compiling on Linux with mingw

Martin Sustrik sustrik at fastmq.com
Mon Apr 6 16:28:05 CEST 2009


Pekka,

Thanks for the patch. Can you please state that you are submitting it 
under MIT license? Once you do so we'll merge the patch in so that it 
gets into upcoming 0.6 release.

Martin

Pekka Enberg wrote:
> From: Pekka Enberg <penberg at cs.helsinki.fi>
> 
> The header files are lower case on Linux when cross-compiling with mingw
> whereas on Windows it doesn't matter because the filesystem is case
> insensitive.
> 
> Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
> ---
>  libzmq/zmq/err.hpp |    2 +-
>  libzmq/zmq/ip.hpp  |    6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> Index: zmq-0.5/libzmq/zmq/err.hpp
> ===================================================================
> --- zmq-0.5.orig/libzmq/zmq/err.hpp	2009-04-06 17:16:31.000000000 +0300
> +++ zmq-0.5/libzmq/zmq/err.hpp	2009-04-06 17:16:43.000000000 +0300
> @@ -29,7 +29,7 @@
>  #include <zmq/platform.hpp>
>  
>  #ifdef ZMQ_HAVE_WINDOWS
> -#include <Winsock2.h>
> +#include <winsock2.h>
>  #else
>  #include <netdb.h>
>  #endif
> Index: zmq-0.5/libzmq/zmq/ip.hpp
> ===================================================================
> --- zmq-0.5.orig/libzmq/zmq/ip.hpp	2009-04-06 17:16:40.000000000 +0300
> +++ zmq-0.5/libzmq/zmq/ip.hpp	2009-04-06 17:16:43.000000000 +0300
> @@ -23,9 +23,9 @@
>  #include <zmq/platform.hpp>
>  
>  #ifdef ZMQ_HAVE_WINDOWS
> -#include <Winsock2.h>
> -#include <Ws2tcpip.h>
> -#include <Ipexport.h>
> +#include <winsock2.h>
> +#include <ws2tcpip.h>
> +#include <ipexport.h>
>  #else
>  #include <sys/socket.h>
>  #include <arpa/inet.h>
> 
> 
> _______________________________________________
> zeromq-dev mailing list
> zeromq-dev at lists.zeromq.org
> http://lists.zeromq.org/mailman/listinfo/zeromq-dev




More information about the zeromq-dev mailing list