projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add apps_startup and bio_err init code to smime.c
[openssl.git]
/
e_os2.h
diff --git
a/e_os2.h
b/e_os2.h
index ed90f222e2180c2c5b20cc5660cd8acfb69ad58a..9c4a541728df9110ba304d24eb3faee7f8895bfe 100644
(file)
--- a/
e_os2.h
+++ b/
e_os2.h
@@
-121,9
+121,6
@@
extern "C" {
# if defined(_WINDLL) /* This is used when building OpenSSL to indicate that
DLL linkage should be used */
# define OPENSSL_OPT_WINDLL
# if defined(_WINDLL) /* This is used when building OpenSSL to indicate that
DLL linkage should be used */
# define OPENSSL_OPT_WINDLL
-# elif defined(_DLL) /* This one is used quite much in the VC++ header
- files */
-# define OPENSSL_OPT_WINDLL
# endif
# endif
#endif
# endif
# endif
#endif
@@
-134,14
+131,23
@@
extern "C" {
# define OPENSSL_SYS_VMS
# if defined(__DECC)
# define OPENSSL_SYS_VMS_DECC
# define OPENSSL_SYS_VMS
# if defined(__DECC)
# define OPENSSL_SYS_VMS_DECC
+# elif defined(__DECCXX)
+# define OPENSSL_SYS_VMS_DECC
+# define OPENSSL_SYS_VMS_DECCXX
# else
# define OPENSSL_SYS_VMS_NODECC
# endif
#endif
# else
# define OPENSSL_SYS_VMS_NODECC
# endif
#endif
+/* --------------------------------- OS/2 ---------------------------------- */
+#if defined(__EMX__) || defined(__OS2__)
+# undef OPENSSL_SYS_UNIX
+# define OPENSSL_SYS_OS2
+#endif
+
/* --------------------------------- Unix ---------------------------------- */
#ifdef OPENSSL_SYS_UNIX
/* --------------------------------- Unix ---------------------------------- */
#ifdef OPENSSL_SYS_UNIX
-# if defined(linu
s
) || defined(OPENSSL_SYSNAME_LINUX)
+# if defined(linu
x) || defined(__linux__
) || defined(OPENSSL_SYSNAME_LINUX)
# define OPENSSL_SYS_LINUX
# endif
# ifdef OPENSSL_SYSNAME_MPE
# define OPENSSL_SYS_LINUX
# endif
# ifdef OPENSSL_SYSNAME_MPE
@@
-226,8
+232,8
@@
extern "C" {
#define foobar OPENSSL_GLOBAL_REF(foobar)
*/
#ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
#define foobar OPENSSL_GLOBAL_REF(foobar)
*/
#ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
-# define OPENSSL_IMPLEMENT_GLOBAL(type,name)
extern
static type _hide_##name; \
- type *_shadow_##name(void) {
static type local_var; return &local_var
; } \
+# define OPENSSL_IMPLEMENT_GLOBAL(type,name) static type _hide_##name; \
+ type *_shadow_##name(void) {
return &_hide_##name
; } \
static type _hide_##name
# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
static type _hide_##name
# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))