From 8f892a9fb419a5b2597935f7fb09a9cae67ccddc Mon Sep 17 00:00:00 2001
From: Kevin Tew <tewk@racket-lang.org>
Date: Fri, 20 Aug 2010 11:24:48 -0600
Subject: [PATCH] fix clang compiler errors

---
 src/gracket/wxs/wxscheme.cxx                                | 2 +-
 src/racket/cmdline.inc                                      | 4 ++--
 .../gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h    | 2 +-
 src/wxxt/src/DataStructures/TypeTree.cc                     | 2 +-
 src/wxxt/src/Utilities/Home.cc                              | 2 +-
 src/wxxt/utils/image/src/wx_24to8.cc                        | 6 +++---
 src/wxxt/utils/image/src/wx_gif.cc                          | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gracket/wxs/wxscheme.cxx b/src/gracket/wxs/wxscheme.cxx
index eb333cc438..7af1a7db66 100644
--- a/src/gracket/wxs/wxscheme.cxx
+++ b/src/gracket/wxs/wxscheme.cxx
@@ -1470,7 +1470,7 @@ extern char *wxPostScriptFontsToString(void *used_fonts)
       return SCHEME_BYTE_STR_VAL(s);
     }
   }
-  return "";
+  return (char*) "";
 }
 
 /***********************************************************************/
diff --git a/src/racket/cmdline.inc b/src/racket/cmdline.inc
index ec2eb4c0ca..72af94a6a3 100644
--- a/src/racket/cmdline.inc
+++ b/src/racket/cmdline.inc
@@ -6,7 +6,7 @@
 
 #define SDESC "Set! works on undefined identifiers"
 
-char *cmdline_exe_hack = 
+char *cmdline_exe_hack = (char *)
   ("[Replace me for EXE hack                                       "
    "                                                              ]");
 
@@ -1219,7 +1219,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
 
 #ifndef DONT_PARSE_COMMAND_LINE
  show_help:
-  prog =("%s"
+  prog = (char *) ("%s"
          PROGRAM_LC " [<option> ...] <argument> ...\n"
 # ifndef RACKET_CMD_LINE
 #  ifdef wx_x
diff --git a/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
index 91e99e6204..9da843287d 100644
--- a/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
+++ b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
@@ -126,7 +126,7 @@ AO_test_and_set_full(volatile AO_TS_t *addr)
   /* Note: the "xchg" instruction does not need a "lock" prefix */
   __asm__ __volatile__("xchgb %0, %1"
 		: "=q"(oldval), "=m"(*addr)
-		: "0"(0xff), "m"(*addr) : "memory");
+		: "0"((AO_TS_t) 0xff), "m"(*addr) : "memory");
   return (AO_TS_VAL_t)oldval;
 }
 
diff --git a/src/wxxt/src/DataStructures/TypeTree.cc b/src/wxxt/src/DataStructures/TypeTree.cc
index 45bf3d8d55..2569a54e4c 100644
--- a/src/wxxt/src/DataStructures/TypeTree.cc
+++ b/src/wxxt/src/DataStructures/TypeTree.cc
@@ -161,7 +161,7 @@ char *wxGetTypeName(WXTYPE type)
   wxTypeDef *typ;
 
   if (type == wxTYPE_ANY)
-    return "any";
+    return (char *) "any";
   typ = (wxTypeDef *)wxAllTypes->Get((long)type);
   if (!typ)
     return NULL;
diff --git a/src/wxxt/src/Utilities/Home.cc b/src/wxxt/src/Utilities/Home.cc
index b6f28a2491..9a50ce055a 100644
--- a/src/wxxt/src/Utilities/Home.cc
+++ b/src/wxxt/src/Utilities/Home.cc
@@ -36,7 +36,7 @@ char *wxGetUserHome(const char *user)
     struct passwd *who = NULL;
 
     if (user == NULL || *user == '\0') {
-	register char *ptr;
+	char *ptr;
 
 	if ((ptr = getenv("HOME")) != NULL) 
 	    return ptr;
diff --git a/src/wxxt/utils/image/src/wx_24to8.cc b/src/wxxt/utils/image/src/wx_24to8.cc
index 1891aba5ae..d001b3a2df 100644
--- a/src/wxxt/utils/image/src/wx_24to8.cc
+++ b/src/wxxt/utils/image/src/wx_24to8.cc
@@ -509,8 +509,8 @@ CCELL *create_colorcell(int r1, int g1, int b1,
 /*******************************/
 {
   register int    i,tmp, dist;
-  register CCELL *ptr;
-  register byte  *rp,*gp,*bp;
+  CCELL *ptr;
+  byte  *rp,*gp,*bp;
   int             ir,ig,ib, mindist;
 
   ir = r1 >> (COLOR_DEPTH-C_DEPTH);
@@ -661,7 +661,7 @@ static void map_colortable(byte *r, byte *g, byte *b)
 int wxImage::quant_fsdither()
 /*****************************/
 {
-  register int  *thisptr, *nextptr;
+  int           *thisptr, *nextptr;
   int           *thisline, *nextline, *tmpptr;
   int            r1, g1, b1, r2, g2, b2;
   int            i, j, imax, jmax, oval;
diff --git a/src/wxxt/utils/image/src/wx_gif.cc b/src/wxxt/utils/image/src/wx_gif.cc
index acc3b734ed..257374471f 100644
--- a/src/wxxt/utils/image/src/wx_gif.cc
+++ b/src/wxxt/utils/image/src/wx_gif.cc
@@ -108,7 +108,7 @@ int filesize;
 int wxImage::LoadGIF(char *fname, int /* nc */)
 {
   register byte  ch, ch1;
-  register byte *ptr, *ptr1, *picptr;
+  byte *ptr, *ptr1, *picptr;
   register int   i;
   int            npixels, maxpixels;