Add new -out option to asn1parse to allow the parsed data to be output.

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 3d142ec2ba515c0df3da1a31f2bb2ce93dd32285..9f525cb8e1d3e731de0c7310654c7ba309a24cec 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -75,10 +75,6 @@ extern "C" {
 #define DEVRANDOM "/dev/urandom"
 #endif
 
-#if defined(NOCONST)
-#define const
-#endif
-
 /********************************************************************
  The Microsoft section
  ********************************************************************/
@@ -102,6 +98,12 @@ extern "C" {
 #ifdef WIN32
 #define get_last_sys_error()   GetLastError()
 #define clear_sys_error()      SetLastError(0)
+/* These are defined in wincrypt.h and can cause problems */
+#undef X509_NAME
+#undef PKCS7_SIGNER_INFO
+#if !defined(WINNT)
+#define WIN_CONSOLE_BUG
+#endif
 #else
 #define get_last_sys_error()   errno
 #define clear_sys_error()      errno=0
@@ -110,10 +112,16 @@ extern "C" {
 #ifdef WINDOWS
 #define get_last_socket_error()        WSAGetLastError()
 #define clear_socket_error()   WSASetLastError(0)
+#define readsocket(s,b,n)      recv((s),(b),(n),0)
+#define writesocket(s,b,n)     send((s),(b),(n),0)
+#define EADDRINUSE             WSAEADDRINUSE
 #else
 #define get_last_socket_error()        errno
 #define clear_socket_error()   errno=0
 #define ioctlsocket(a,b,c)     ioctl(a,b,c)
+#define closesocket(s)         close(s)
+#define readsocket(s,b,n)      read((s),(b),(n))
+#define writesocket(s,b,n)     write((s),(b),(n))
 #endif
 
 #ifdef WIN16
@@ -137,9 +145,13 @@ extern "C" {
 
 #ifndef S_IFMT
 #define S_IFMT _S_IFMT
+
+#if !defined(WINNT)
+#define NO_SYSLOG
 #endif
+#define NO_DIRENT
 
-#define strncasecmp(a,b,c)     strnicmp((a),(b),(c))
+#endif
 
 #  ifdef WINDOWS
 #    include <windows.h>
@@ -151,6 +163,13 @@ extern "C" {
 #  include <io.h>
 #  include <fcntl.h>
 
+#if defined (__BORLANDC__)
+#define _setmode setmode
+#define _O_TEXT O_TEXT
+#define _O_BINARY O_BINARY
+#define _int64 __int64
+#endif
+
 #if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST)
 #  define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); }
 #else
@@ -166,7 +185,8 @@ extern "C" {
 #ifndef R_OK
 #  define R_OK 4
 #endif
-#  define SSLEAY_CONF  "ssleay.cnf"
+#  define OPENSSL_CONF "openssl.cnf"
+#  define SSLEAY_CONF  OPENSSL_CONF
 #  define NUL_DEV      "nul"
 #  define RFILE                ".rnd"
 
@@ -178,7 +198,8 @@ extern "C" {
 #    include <unistd.h>
 #  endif
 
-#  define SSLEAY_CONF  "ssleay.cnf"
+#  define OPENSSL_CONF "openssl.cnf"
+#  define SSLEAY_CONF  OPENSSL_CONF
 #  define RFILE                ".rnd"
 #  define LIST_SEPARATOR_CHAR ':'
 #  ifndef MONOLITH
@@ -251,7 +272,7 @@ extern HINSTANCE _hInstance;
 #    define SSLeay_Write(a,b,c)    write((a),(b),(c))
 #    define SHUTDOWN(fd)    { shutdown((fd),0); close((fd)); }
 #    define SHUTDOWN2(fd)   { shutdown((fd),2); close((fd)); }
-#    define INVALID_SOCKET     -1
+#    define INVALID_SOCKET     (-1)
 #  endif
 #endif
 
@@ -263,26 +284,6 @@ extern HINSTANCE _hInstance;
 
 /***********************************************/
 
-#ifndef NOPROTO
-#define P_CC_CC        const void *,const void *
-#define P_I_I          int,int 
-#define P_I_I_P                int,int,char *
-#define P_I_I_P_I      int,int,char *,int
-#define P_IP_I_I_P_I   int *,int,int,char *,int
-#define P_V            void 
-#else
-#define P_CC_CC
-#define P_I_I
-#define P_I_I_P
-#define P_IP_I_I_P_I
-#define P_I_I_P_I
-#define P_V
-#endif
-
-/* not used yet */
-#define        CS_BEGIN
-#define CS_END
-
 /* do we need to do this for getenv.
  * Just define getenv for use under windows */