projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* crypto/ui/ui_lib.c: misplaced brace in switch statement.
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index c5ed54f3b2992bca2b52b1d845ab99a251512db0..0a97895360d71407e2be33279641421728ac796e 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-134,6
+134,7
@@
extern "C" {
#endif
#ifdef WIN32
#endif
#ifdef WIN32
+#define NO_SYS_UN_H
#define get_last_sys_error() GetLastError()
#define clear_sys_error() SetLastError(0)
#if !defined(WINNT)
#define get_last_sys_error() GetLastError()
#define clear_sys_error() SetLastError(0)
#if !defined(WINNT)
@@
-310,7
+311,7
@@
static unsigned int _strlen31(const char *str)
# undef isxdigit
# endif
# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
# undef isxdigit
# endif
# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
-# if _MSC_VER>=1300
+# if _MSC_VER>=1300
&& _MSC_VER<1600
# undef stdin
# undef stdout
# undef stderr
# undef stdin
# undef stdout
# undef stderr
@@
-318,7
+319,7
@@
static unsigned int _strlen31(const char *str)
# define stdin (&__iob_func()[0])
# define stdout (&__iob_func()[1])
# define stderr (&__iob_func()[2])
# define stdin (&__iob_func()[0])
# define stdout (&__iob_func()[1])
# define stderr (&__iob_func()[2])
-# elif defined(I_CAN_LIVE_WITH_LNK4049)
+# elif
_MSC_VER<1300 &&
defined(I_CAN_LIVE_WITH_LNK4049)
# undef stdin
# undef stdout
# undef stderr
# undef stdin
# undef stdout
# undef stderr
@@
-579,6
+580,16
@@
static unsigned int _strlen31(const char *str)
# include <inet.h>
# else
# include <sys/socket.h>
# include <inet.h>
# else
# include <sys/socket.h>
+# ifndef NO_SYS_UN_H
+# ifdef OPENSSL_SYS_VXWORKS
+# include <streams/un.h>
+# else
+# include <sys/un.h>
+# endif
+# ifndef UNIX_PATH_MAX
+# define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
+# endif
+# endif
# ifdef FILIO_H
# include <sys/filio.h> /* Added for FIONBIO under unixware */
# endif
# ifdef FILIO_H
# include <sys/filio.h> /* Added for FIONBIO under unixware */
# endif