From: Richard Levitte Date: Thu, 2 Mar 2000 07:42:48 +0000 (+0000) Subject: It started with finding a misplaced #endif. Then I wanted to see the X-Git-Tag: OpenSSL_0_9_5a-beta1~123 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0056ef5d01501de3e9b4f85fdcd4023177b2901c;p=oweals%2Fopenssl.git It started with finding a misplaced #endif. Then I wanted to see the structure better. I hope noone minds, and that it still works. Steve? --- diff --git a/e_os.h b/e_os.h index d23ab54aaf..2147c17052 100644 --- a/e_os.h +++ b/e_os.h @@ -171,19 +171,18 @@ extern "C" { #if defined(WINDOWS) || defined(MSDOS) -#ifndef S_IFDIR -#define S_IFDIR _S_IFDIR -#endif - -#ifndef S_IFMT -#define S_IFMT _S_IFMT +# ifndef S_IFDIR +# define S_IFDIR _S_IFDIR +# endif -#if !defined(WINNT) -#define NO_SYSLOG -#endif -#define NO_DIRENT +# ifndef S_IFMT +# define S_IFMT _S_IFMT +# endif -#endif +# if !defined(WINNT) +# define NO_SYSLOG +# endif +# define NO_DIRENT # ifdef WINDOWS # include @@ -195,29 +194,29 @@ extern "C" { # include # include -#if defined (__BORLANDC__) -#define _setmode setmode -#define _O_TEXT O_TEXT -#define _O_BINARY O_BINARY -#define _int64 __int64 -#define _kbhit kbhit -#endif +# if defined (__BORLANDC__) +# define _setmode setmode +# define _O_TEXT O_TEXT +# define _O_BINARY O_BINARY +# define _int64 __int64 +# define _kbhit kbhit +# endif -#if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST) -# define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); } -#else -# define EXIT(n) return(n); -#endif +# if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST) +# define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); } +# else +# define EXIT(n) return(n); +# endif # define LIST_SEPARATOR_CHAR ';' -#ifndef X_OK -# define X_OK 0 -#endif -#ifndef W_OK -# define W_OK 2 -#endif -#ifndef R_OK -# define R_OK 4 -#endif +# ifndef X_OK +# define X_OK 0 +# endif +# ifndef W_OK +# define W_OK 2 +# endif +# ifndef R_OK +# define R_OK 4 +# endif # define OPENSSL_CONF "openssl.cnf" # define SSLEAY_CONF OPENSSL_CONF # define NUL_DEV "nul"