From e3a570db199e43444bc8fdcb77b4a9871580d294 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 8 Jul 2014 11:11:57 +0000
Subject: We do not care about broken Borland C pre-processors.

ok beck@ deraadt@
---
 src/lib/libcrypto/err/err.h         | 8 +++-----
 src/lib/libssl/src/crypto/err/err.h | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 9eb1158e75..fc2f1a4eaf 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.h,v 1.18 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: err.h,v 1.19 2014/07/08 11:11:57 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -232,10 +232,8 @@ typedef struct err_state_st {
 #define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
 #define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__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)| \
+#define ERR_PACK(l,f,r)		(((((unsigned long)l)&0xffL)<<24L)| \
+				((((unsigned long)f)&0xfffL)<<12L)| \
 				((((unsigned long)r)&0xfffL)))
 #define ERR_GET_LIB(l)		(int)((((unsigned long)l)>>24L)&0xffL)
 #define ERR_GET_FUNC(l)		(int)((((unsigned long)l)>>12L)&0xfffL)
diff --git a/src/lib/libssl/src/crypto/err/err.h b/src/lib/libssl/src/crypto/err/err.h
index 9eb1158e75..fc2f1a4eaf 100644
--- a/src/lib/libssl/src/crypto/err/err.h
+++ b/src/lib/libssl/src/crypto/err/err.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.h,v 1.18 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: err.h,v 1.19 2014/07/08 11:11:57 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -232,10 +232,8 @@ typedef struct err_state_st {
 #define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
 #define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__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)| \
+#define ERR_PACK(l,f,r)		(((((unsigned long)l)&0xffL)<<24L)| \
+				((((unsigned long)f)&0xfffL)<<12L)| \
 				((((unsigned long)r)&0xfffL)))
 #define ERR_GET_LIB(l)		(int)((((unsigned long)l)>>24L)&0xffL)
 #define ERR_GET_FUNC(l)		(int)((((unsigned long)l)>>12L)&0xfffL)
-- 
cgit v1.2.3-55-g6feb