On Tue, Feb 11, 2014 at 8:17 AM, Ben Pfaff <b...@nicira.com> wrote: > On Mon, Feb 10, 2014 at 03:25:38PM -0800, Gurucharan Shetty wrote: >> This commit creates events and through poll_fd_wait_event() >> associates them with socket file descriptors to get woken up >> from poll_block(). >> >> Some other changes: >> >> * Windows does not have sys/fcntl.h but has a fcntl.h >> On Linux, there is fctnl.h too. >> >> * include <openssl/applink.c> to handle different C-Runtime linking >> of OVS and openssl libraries as suggested at >> https://www.openssl.org/support/faq.html#PROG2 >> >> The above include will not be needed if we compile Open vSwitch with >> /MD compiler option. >> >> * SHUT_RDWR is equivalent to SD_BOTH on Windows. >> >> Signed-off-by: Gurucharan Shetty <gshe...@nicira.com> > > ... > >> +#ifdef _WIN32 > > Would you mind adding the above reference to the OpenSSL FAQ entry here > in a comment? I will add the following comment and push it.
#ifdef _WIN32 /* Ref: https://www.openssl.org/support/faq.html#PROG2 * Your application must link against the same version of the Win32 C-Runtime * against which your openssl libraries were linked. The default version for * OpenSSL is /MD - "Multithreaded DLL". If we compile Open vSwitch with * something other than /MD, instead of re-compiling OpenSSL * toolkit, openssl/applink.c can be #included. Also, it is important * to add CRYPTO_malloc_init prior first call to OpenSSL. * * XXX: The behavior of the following #include when Open vSwitch is * compiled with /MD is not tested. */ #include <openssl/applink.c> #define SHUT_RDWR SD_BOTH #else #define closesocket close #endif > >> +#include <openssl/applink.c> >> +#define SHUT_RDWR SD_BOTH >> +#else >> +#define closesocket close >> +#endif >> + > > Acked-by: Ben Pfaff <b...@nicira.com> _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
