projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Call of memcmp with null pointers in obj_cmp()
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index 5549abec48c0f129898c12e72680f69b3a4de480..7f94bfcae678cf8e8ac8f8f72d0da2ac0bf0a8fe 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-102,16
+102,6
@@
extern "C" {
/********************************************************************
The Microsoft section
********************************************************************/
/********************************************************************
The Microsoft section
********************************************************************/
-/*
- * The following is used because of the small stack in some Microsoft
- * operating systems
- */
-# if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32)
-# define MS_STATIC static
-# else
-# define MS_STATIC
-# endif
-
# if defined(OPENSSL_SYS_WIN32) && !defined(WIN32)
# define WIN32
# endif
# if defined(OPENSSL_SYS_WIN32) && !defined(WIN32)
# define WIN32
# endif
@@
-395,6
+385,7
@@
extern FILE *_imp___iob;
__VMS_EXIT |= 0x10000000; \
exit(__VMS_EXIT); } while(0)
# define NO_SYS_PARAM_H
__VMS_EXIT |= 0x10000000; \
exit(__VMS_EXIT); } while(0)
# define NO_SYS_PARAM_H
+# define NO_SYS_UN_H
# elif defined(OPENSSL_SYS_NETWARE)
# include <fcntl.h>
# elif defined(OPENSSL_SYS_NETWARE)
# include <fcntl.h>
@@
-698,6
+689,8
@@
struct servent *getservbyname(const char *name, const char *proto);
# endif
# endif
# endif
# endif
+#define OSSL_NELEM(x) (sizeof(x)/sizeof(x[0]))
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif