From: Ben Gras <ben@minix3.org>
Date: Fri, 6 Jan 2006 16:49:58 +0000 (+0000)
Subject: Fixes for #defines growing a _
X-Git-Tag: v3.1.2a~464
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/static/style.css?a=commitdiff_plain;h=d9827f56bafd57fb1ed19608e8c7fa36be16fdb9;p=minix.git

Fixes for #defines growing a _
---

diff --git a/commands/de/de.h b/commands/de/de.h
index 550587d61..7a0245da9 100755
--- a/commands/de/de.h
+++ b/commands/de/de.h
@@ -244,7 +244,7 @@ typedef  struct  de_state		/*  State of disk ed.	*/
   zone_t block;				/*  Current block (1K)	*/
   unsigned offset;			/*  Offset within block	*/
 
-  char buffer[ MAX_BLOCK_SIZE ];
+  char buffer[ _MAX_BLOCK_SIZE ];
 
   /*  Display state  */
 
diff --git a/commands/de/de_diskio.c b/commands/de/de_diskio.c
index fe53f974c..e4162782d 100755
--- a/commands/de/de_diskio.c
+++ b/commands/de/de_diskio.c
@@ -135,14 +135,14 @@ void Read_Super_Block( s )
     s->zone_num_size = V1_ZONE_NUM_SIZE;
     s->zones = super->s_nzones;
     s->ndzones = V1_NR_DZONES;
-    s->block_size = STATIC_BLOCK_SIZE;
+    s->block_size = _STATIC_BLOCK_SIZE;
     }
   else if ( s->magic == SUPER_V2 || s->magic == SUPER_V3)
     {
     if(s->magic == SUPER_V3)
     	s->block_size = super->s_block_size;
     else
-    	s->block_size = STATIC_BLOCK_SIZE;
+    	s->block_size = _STATIC_BLOCK_SIZE;
     s->is_fs = TRUE;
     s->v1 = FALSE;
     s->inode_size = V2_INODE_SIZE;
diff --git a/commands/de/de_recover.c b/commands/de/de_recover.c
index fb56dc7ed..add90cfc8 100755
--- a/commands/de/de_recover.c
+++ b/commands/de/de_recover.c
@@ -453,7 +453,7 @@ int Indirect( s, block, file_size, dblind )
   union
     {
     zone1_t ind1[ V1_INDIRECTS ];
-    zone_t  ind2[ V2_INDIRECTS(MAX_BLOCK_SIZE) ];
+    zone_t  ind2[ V2_INDIRECTS(_MAX_BLOCK_SIZE) ];
     } indirect;
   int  i;
   zone_t zone;
diff --git a/commands/ibm/autopart.c b/commands/ibm/autopart.c
index 6059bf071..b55c1f4de 100755
--- a/commands/ibm/autopart.c
+++ b/commands/ibm/autopart.c
@@ -1691,7 +1691,7 @@ ssize_t boot_readwrite(int rw)
 		if (ioctl(device, DIOCGETP, &geom0) < 0) return -1;
 		geom_seek.base = add64(geom0.base, off64);
 		geom_seek.size = cvu64(cmp64(add64u(off64, SECTOR_SIZE),
-			geom0.size) <= 0 ? STATIC_BLOCK_SIZE : 0);
+			geom0.size) <= 0 ? _STATIC_BLOCK_SIZE : 0);
 		sync();
 		if (ioctl(device, DIOCSETP, &geom_seek) < 0) return -1;
 		if (lseek(device, (off_t) 0, SEEK_SET) == -1) return -1;
diff --git a/commands/ibm/part.c b/commands/ibm/part.c
index c647ea802..8cbb4ccf6 100755
--- a/commands/ibm/part.c
+++ b/commands/ibm/part.c
@@ -1622,7 +1622,7 @@ ssize_t boot_readwrite(int rw)
 		if (ioctl(device, DIOCGETP, &geom0) < 0) return -1;
 		geom_seek.base = add64(geom0.base, off64);
 		geom_seek.size = cvu64(cmp64(add64u(off64, SECTOR_SIZE),
-			geom0.size) <= 0 ? STATIC_BLOCK_SIZE : 0);
+			geom0.size) <= 0 ? _STATIC_BLOCK_SIZE : 0);
 		sync();
 		if (ioctl(device, DIOCSETP, &geom_seek) < 0) return -1;
 		if (lseek(device, (off_t) 0, SEEK_SET) == -1) return -1;