ec/ecp_nistz256.c: further harmonization with latest rules.

[openssl.git] / e_os2.h

diff --git a/e_os2.h b/e_os2.h
index f4597a2c6703fc2037e0b06e0d55f74e415c0a4f..837f791fb911256be112ff230e440d90c6f3dc0a 100644 (file)
--- a/e_os2.h
+++ b/e_os2.h
@@ -70,12 +70,6 @@ extern "C" {
 
 #define OPENSSL_SYS_UNIX
 
-/* ----------------------- Macintosh, before MacOS X ----------------------- */
-#if defined(__MWERKS__) && defined(macintosh) || defined(OPENSSL_SYSNAME_MAC)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_MACINTOSH_CLASSIC
-#endif
-
 /* ----------------------- NetWare ----------------------------------------- */
 #if defined(NETWARE) || defined(OPENSSL_SYSNAME_NETWARE)
 # undef OPENSSL_SYS_UNIX
@@ -162,31 +156,15 @@ extern "C" {
 # if defined(linux) || defined(__linux__) || defined(OPENSSL_SYSNAME_LINUX)
 #  define OPENSSL_SYS_LINUX
 # endif
-# ifdef OPENSSL_SYSNAME_MPE
-#  define OPENSSL_SYS_MPE
-# endif
 # ifdef OPENSSL_SYSNAME_SNI
 #  define OPENSSL_SYS_SNI
 # endif
 # ifdef OPENSSL_SYSNAME_ULTRASPARC
 #  define OPENSSL_SYS_ULTRASPARC
 # endif
-# ifdef OPENSSL_SYSNAME_NEWS4
-#  define OPENSSL_SYS_NEWS4
-# endif
 # ifdef OPENSSL_SYSNAME_MACOSX
 #  define OPENSSL_SYS_MACOSX
 # endif
-# ifdef OPENSSL_SYSNAME_MACOSX_RHAPSODY
-#  define OPENSSL_SYS_MACOSX_RHAPSODY
-#  define OPENSSL_SYS_MACOSX
-# endif
-# ifdef OPENSSL_SYSNAME_SUNOS
-#  define OPENSSL_SYS_SUNOS
-#endif
-# if defined(_CRAY) || defined(OPENSSL_SYSNAME_CRAY)
-#  define OPENSSL_SYS_CRAY
-# endif
 # if defined(_AIX) || defined(OPENSSL_SYSNAME_AIX)
 #  define OPENSSL_SYS_AIX
 # endif
@@ -208,17 +186,6 @@ extern "C" {
 # define OPENSSL_SYS_VXWORKS
 #endif
 
-/* --------------------------------- BeOS ---------------------------------- */
-#if defined(__BEOS__)
-# define OPENSSL_SYS_BEOS
-# include <sys/socket.h>
-# if defined(BONE_VERSION)
-#  define OPENSSL_SYS_BEOS_BONE
-# else
-#  define OPENSSL_SYS_BEOS_R5
-# endif
-#endif
-
 /**
  * That's it for OS-specific stuff
  *****************************************************************************/
@@ -233,24 +200,25 @@ extern "C" {
 # define OPENSSL_DECLARE_EXIT /* declared in unistd.h */
 #endif
 
-/* Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare
-   certain global symbols that, with some compilers under VMS, have to be
-   defined and declared explicitely with globaldef and globalref.
-   Definitions of OPENSSL_EXPORT and OPENSSL_IMPORT, to define and declare
-   DLL exports and imports for compilers under Win32.  These are a little
-   more complicated to use.  Basically, for any library that exports some
-   global variables, the following code must be present in the header file
-   that declares them, before OPENSSL_EXTERN is used:
-
-   #ifdef SOME_BUILD_FLAG_MACRO
-   # undef OPENSSL_EXTERN
-   # define OPENSSL_EXTERN OPENSSL_EXPORT
-   #endif
-
-   The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL
-   have some generally sensible values, and for OPENSSL_EXTERN to have the
-   value OPENSSL_IMPORT.
-*/
+/*-
+ * Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare
+ * certain global symbols that, with some compilers under VMS, have to be
+ * defined and declared explicitely with globaldef and globalref.
+ * Definitions of OPENSSL_EXPORT and OPENSSL_IMPORT, to define and declare
+ * DLL exports and imports for compilers under Win32.  These are a little
+ * more complicated to use.  Basically, for any library that exports some
+ * global variables, the following code must be present in the header file
+ * that declares them, before OPENSSL_EXTERN is used:
+ *
+ * #ifdef SOME_BUILD_FLAG_MACRO
+ * # undef OPENSSL_EXTERN
+ * # define OPENSSL_EXTERN OPENSSL_EXPORT
+ * #endif
+ *
+ * The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL
+ * have some generally sensible values, and for OPENSSL_EXTERN to have the
+ * value OPENSSL_IMPORT.
+ */
 
 #if defined(OPENSSL_SYS_VMS_NODECC)
 # define OPENSSL_EXPORT globalref
@@ -267,16 +235,17 @@ extern "C" {
 #endif
 #define OPENSSL_EXTERN OPENSSL_IMPORT
 
-/* Macros to allow global variables to be reached through function calls when
-   required (if a shared library version requires it, for example.
-   The way it's done allows definitions like this:
-
-       // in foobar.c
-       OPENSSL_IMPLEMENT_GLOBAL(int,foobar,0)
-       // in foobar.h
-       OPENSSL_DECLARE_GLOBAL(int,foobar);
-       #define foobar OPENSSL_GLOBAL_REF(foobar)
-*/
+/*-
+ * Macros to allow global variables to be reached through function calls when
+ * required (if a shared library version requires it, for example.
+ * The way it's done allows definitions like this:
+ *
+ *     // in foobar.c
+ *     OPENSSL_IMPLEMENT_GLOBAL(int,foobar,0)
+ *     // in foobar.h
+ *     OPENSSL_DECLARE_GLOBAL(int,foobar);
+ *     #define foobar OPENSSL_GLOBAL_REF(foobar)
+ */
 #ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
 # define OPENSSL_IMPLEMENT_GLOBAL(type,name,value)                     \
        type *_shadow_##name(void)                                      \
@@ -289,18 +258,10 @@ extern "C" {
 # define OPENSSL_GLOBAL_REF(name) _shadow_##name
 #endif
 
-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) && macintosh==1 && !defined(MAC_OS_GUSI_SOURCE)
-#  define ossl_ssize_t long
-#endif
-
 #ifdef OPENSSL_SYS_MSDOS
 #  define ossl_ssize_t long
 #endif
 
-#if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) || defined(OPENSSL_SYS_SUNOS)
-#  define ssize_t int
-#endif
-
 #if defined(__ultrix) && !defined(ssize_t)
 #  define ossl_ssize_t int 
 #endif