Commit c3ddb263 authored by Rich Salz's avatar Rich Salz
Browse files

More Borland removal. 



And thanks to Miod Vallat for the nudge about ERR_PACK :)

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent a5bb160c

e_os.h

+0 −8
Original line number Diff line number Diff line
@@ -300,14 +300,6 @@ extern FILE *_imp___iob; 
#   define OPENSSL_NO_POSIX_IO

#  endif



#  if defined (__BORLANDC__)

#   define _setmode setmode

#   define _O_TEXT O_TEXT

#   define _O_BINARY O_BINARY

#   define _int64 __int64

#   define _kbhit kbhit

#  endif



#  define EXIT(n) exit(n)

#  define LIST_SEPARATOR_CHAR ';'

#  ifndef X_OK

include/openssl/err.h

+2 −7
Original line number Diff line number Diff line
@@ -234,13 +234,8 @@ typedef struct err_state_st { 
# define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

# define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)



/*

 * Borland C seems too stupid to be able to shift and do longs in the

 * pre-processor :-(

 */

# define ERR_PACK(l,f,r)         (((((unsigned long)l)&0xffL)*0x1000000)| \

                                ((((unsigned long)f)&0xfffL)*0x1000)| \

                                ((((unsigned long)r)&0xfffL)))

# define ERR_PACK(l,f,r) \

    ( (((l) & 0x0FF) << 24L) | (((f) & 0xFFF) << 12L) | ((r) & 0xFFF) )

# define ERR_GET_LIB(l)          (int)((((unsigned long)l)>>24L)&0xffL)

# define ERR_GET_FUNC(l)         (int)((((unsigned long)l)>>12L)&0xfffL)

# define ERR_GET_REASON(l)       (int)((l)&0xfffL)

ms/applink.c

+0 −9
Original line number Diff line number Diff line
@@ -75,16 +75,7 @@ extern "C" { 


__declspec(dllexport)

void **

# if defined(__BORLANDC__)

/*

 * __stdcall appears to be the only way to get the name

 * decoration right with Borland C. Otherwise it works

 * purely incidentally, as we pass no parameters.

 */

 __stdcall

# else

 __cdecl

# endif

OPENSSL_Applink(void)

{

    static int once = 1;