X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fopenssl%2Ferr.h;h=d372520d03ed6f6e47d0e0d6f0d09c46c4306c27;hb=c636c1c470fd2b4b0cb546e6ee85971375e42ec1;hp=4b6c663bb2b61d1bb2d08d9d3fa90baea91e2ac8;hpb=8509dcc9f319190c565ab6baad7c88d37a951d1c;p=oweals%2Fopenssl.git

diff --git a/include/openssl/err.h b/include/openssl/err.h
index 4b6c663bb2..d372520d03 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -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)