Fixes for #defines growing a _

diff --git a/commands/de/de.h b/commands/de/de.h
index 550587d613b8ed33fe7451889afe6c40958f0489..7a0245da9de35e12b6e6703e21c7c8379162f625 100755 (executable)
--- 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 fe53f974c2417f9a80a5829b4d0597d78bdef8fb..e4162782d91ce58dad94b1d702ad50aa6553dcd5 100755 (executable)
--- 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 fb56dc7eda9f33ae008a68fe2bcaad383b0a15e4..add90cfc8d6da05109c16b5b9b5d77fcb1e7bc70 100755 (executable)
--- 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 6059bf0711dd9a2db82c77485cd5301e26f5611b..b55c1f4dea7763de60b79c1f17c06d4e900ab1db 100755 (executable)
--- 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 c647ea802fde096f34a6fdba4610365b0c02ccf8..8cbb4ccf6c261aa9d48a14ddd1a811d60c6b67cb 100755 (executable)
--- 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;