projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix BIO_CTRL_DUP for an SSL BIO
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index f0a441ec8bfcc475acd567e8484601247752d028..eaa9396b88eb9c27559d1abdc47d682a65d55694 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-72,15
+72,12
@@
extern "C" {
/* Used to checking reference counts, most while doing perl5 stuff :-) */
# if defined(OPENSSL_NO_STDIO)
/* Used to checking reference counts, most while doing perl5 stuff :-) */
# if defined(OPENSSL_NO_STDIO)
-# if defined(REF_DEBUG)
-# error "REF_DEBUG requires stdio"
-# endif
# if defined(REF_PRINT)
# error "REF_PRINT requires stdio"
# endif
# endif
# if defined(REF_PRINT)
# error "REF_PRINT requires stdio"
# endif
# endif
-# if
defined(REF_DEBUG
)
+# if
!defined(NDEBUG) && !defined(OPENSSL_NO_STDIO
)
# define REF_ASSERT_ISNT(test) \
(void)((test) ? (OPENSSL_die("refcount error", __FILE__, __LINE__), 1) : 0)
# else
# define REF_ASSERT_ISNT(test) \
(void)((test) ? (OPENSSL_die("refcount error", __FILE__, __LINE__), 1) : 0)
# else
@@
-226,7
+223,7
@@
extern "C" {
*/
# define _WIN32_WINNT 0x0501
# endif
*/
# define _WIN32_WINNT 0x0501
# endif
-# if
!defined(OPENSSL_NO_SOCK) && (defined(_WIN32_WINNT) || defined(_WIN32_WCE)
)
+# if
defined(_WIN32_WINNT) || defined(_WIN32_WCE
)
/*
* Just like defining _WIN32_WINNT including winsock2.h implies
* certain "discipline" for maintaining [broad] binary compatibility.
/*
* Just like defining _WIN32_WINNT including winsock2.h implies
* certain "discipline" for maintaining [broad] binary compatibility.
@@
-395,10
+392,6
@@
extern FILE *_imp___iob;
/*************/
/*************/
-# if defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_DGRAM)
-# define OPENSSL_NO_DGRAM
-# endif
-
# ifdef USE_SOCKETS
# ifdef OPENSSL_NO_SOCK
# elif defined(WINDOWS) || defined(MSDOS)
# ifdef USE_SOCKETS
# ifdef OPENSSL_NO_SOCK
# elif defined(WINDOWS) || defined(MSDOS)
@@
-555,6
+548,13
@@
struct servent *getservbyname(const char *name, const char *proto);
# endif
/* end vxworks */
# endif
/* end vxworks */
+/* haiku */
+# if defined(OPENSSL_SYS_HAIKU)
+# include <sys/select.h>
+# include <sys/time.h>
+# endif
+/* end haiku */
+
#define OSSL_NELEM(x) (sizeof(x)/sizeof(x[0]))
#ifdef __cplusplus
#define OSSL_NELEM(x) (sizeof(x)/sizeof(x[0]))
#ifdef __cplusplus