Added sfdisk. Ststic-ified a bunch of stuff.

2 files changed, 4 insertions, 4 deletions

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index a10fa8a69..e44525d9c 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -75,7 +75,7 @@ do_loadfont(int fd, char *inbuf, int unit, int fontsize) {
         for (i = 0; i < fontsize; i++)
             memcpy(buf+(32*i), inbuf+(unit*i), unit);
 
-#if defined( PIO_FONTX ) && !defined( sparc )
+#if defined( PIO_FONTX ) && !defined( __sparc__ )
         {
             struct consolefontdesc cfd;
 
@@ -196,7 +196,7 @@ loadnewfont(int fd) {
                 exit(1);
             }
             fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
-#if !defined( PIO_FONTX ) || defined( sparc )
+#if !defined( PIO_FONTX ) || defined( __sparc__ )
             if (fontsize != 256) {
                 fprintf(stderr, "Only fontsize 256 supported\n");
                 exit(1);
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index eb5a5dd4a..27865d58e 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -7,7 +7,7 @@
 #include <sys/ioctl.h>
 
 
-const char                      loadkmap_usage[] = "loadkmap\n"
+static const char loadkmap_usage[] = "loadkmap\n"
 "\n"
 "\tLoad a binary keyboard translation table from standard input.\n"
 "\n";
@@ -48,7 +48,7 @@ loadkmap_main(int argc, char * * argv)
         if (flags[i]==1){
             pos=0;
             while (pos < ibuffsz) {
-                if ( (readsz = read(0,ibuff+pos,ibuffsz-pos)) < 0 ) {
+                if ( (readsz = read(0,(char *)ibuff+pos,ibuffsz-pos)) < 0 ) {
                     fprintf(stderr, "Error reading keymap: %s\n", 
                         strerror(errno));
                     return 1;