Commit 8d35ceb9 authored by Corinna Vinschen's avatar Corinna Vinschen Committed by Richard Levitte
Browse files

Use POSIX functions on Cygwin, not Win32 function 



Signed-off-by: default avatarCorinna Vinschen <vinschen@redhat.com>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 23d526ec

apps/speed.c

+1 −9
Original line number Diff line number Diff line
@@ -94,16 +94,8 @@ 
# include <signal.h>

#endif



#if defined(_WIN32) || defined(__CYGWIN__)

#if defined(_WIN32)

# include <windows.h>

# if defined(__CYGWIN__) && !defined(_WIN32)

  /*

   * <windows.h> should define _WIN32, which normally is mutually exclusive

   * with __CYGWIN__, but if it didn't...

   */

#  define _WIN32

  /* this is done because Cygwin alarm() fails sometimes. */

# endif

#endif



#include <openssl/bn.h>

crypto/async/arch/async_posix.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H

#include <openssl/e_os2.h>



#if defined(OPENSSL_SYS_UNIX) && defined(OPENSSL_THREADS)

#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS)



# include <unistd.h>

crypto/async/arch/async_win.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
 * This is the same detection used in cryptlib to set up the thread local

 * storage that we depend on, so just copy that

 */

#if defined(_WIN32) || defined(__CYGWIN__)

#if defined(_WIN32)

#include <openssl/async.h>

# define ASYNC_WIN

# define ASYNC_ARCH

include/openssl/async.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 


#include <stdlib.h>



#if defined(_WIN32) || defined(__CYGWIN__)

#if defined(_WIN32)

#include <windows.h>

#define OSSL_ASYNC_FD   HANDLE

#else

test/asynctest.c

+2 −2
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ 
#include <openssl/crypto.h>

#include <../apps/apps.h>



#if defined(OPENSSL_SYS_UNIX) && defined(OPENSSL_THREADS)

#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS)

# include <unistd.h>

# if _POSIX_VERSION >= 200112L

#  define ASYNC_POSIX

# endif

#elif defined(_WIN32) || defined(__CYGWIN__)

#elif defined(_WIN32)

# define ASYNC_WIN

#endif