From d7dfbdd7abde2c1e28fd3c14e5983c8ef2d91025 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Thu, 3 Aug 2000 12:18:49 +0000
Subject: [PATCH] BSIZE -> des_BSIZE to avoid conflicts with AIX jfs/fsparam.h

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8884 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/des/des_locl.h | 2 +-
 lib/des/enc_read.c | 6 +++---
 lib/des/enc_writ.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/des/des_locl.h b/lib/des/des_locl.h
index 09fcf3545..5de15dbea 100644
--- a/lib/des/des_locl.h
+++ b/lib/des/des_locl.h
@@ -223,7 +223,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 
 /* used in des_read and des_write */
 #define MAXWRITE	(1024*16)
-#define BSIZE		(MAXWRITE+4)
+#define des_BSIZE	(MAXWRITE+4)
 
 #define c2l(c,l)	(l =((DES_LONG)(*((c)++)))    , \
 			 l|=((DES_LONG)(*((c)++)))<< 8L, \
diff --git a/lib/des/enc_read.c b/lib/des/enc_read.c
index 2d79d3119..fa2612cd8 100644
--- a/lib/des/enc_read.c
+++ b/lib/des/enc_read.c
@@ -87,17 +87,17 @@ des_cblock (*iv);
 
 	if (tmpbuf == NULL)
 		{
-		tmpbuf=(char *)malloc(BSIZE);
+		tmpbuf=(char *)malloc(des_BSIZE);
 		if (tmpbuf == NULL) return(-1);
 		}
 	if (net == NULL)
 		{
-		net=(unsigned char *)malloc(BSIZE);
+		net=(unsigned char *)malloc(des_BSIZE);
 		if (net == NULL) return(-1);
 		}
 	if (unnet == NULL)
 		{
-		unnet=(char *)malloc(BSIZE);
+		unnet=(char *)malloc(des_BSIZE);
 		if (unnet == NULL) return(-1);
 		}
 	/* left over data from last decrypt */
diff --git a/lib/des/enc_writ.c b/lib/des/enc_writ.c
index cf6138271..fbc93e35d 100644
--- a/lib/des/enc_writ.c
+++ b/lib/des/enc_writ.c
@@ -83,7 +83,7 @@ des_cblock (*iv);
 
 	if (outbuf == NULL)
 		{
-		outbuf=(char *)malloc(BSIZE+HDRSIZE);
+		outbuf=(char *)malloc(des_BSIZE+HDRSIZE);
 		if (outbuf == NULL) return(-1);
 		}
 	/* If we are sending less than 8 bytes, the same char will look