fix clang compiler errors

This commit is contained in:
Kevin Tew 2010-08-20 11:24:48 -06:00
parent d5247cd0f4
commit 8f892a9fb4
7 changed files with 10 additions and 10 deletions

View File

@ -1470,7 +1470,7 @@ extern char *wxPostScriptFontsToString(void *used_fonts)
return SCHEME_BYTE_STR_VAL(s); return SCHEME_BYTE_STR_VAL(s);
} }
} }
return ""; return (char*) "";
} }
/***********************************************************************/ /***********************************************************************/

View File

@ -6,7 +6,7 @@
#define SDESC "Set! works on undefined identifiers" #define SDESC "Set! works on undefined identifiers"
char *cmdline_exe_hack = char *cmdline_exe_hack = (char *)
("[Replace me for EXE hack " ("[Replace me for EXE hack "
" ]"); " ]");
@ -1219,7 +1219,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
#ifndef DONT_PARSE_COMMAND_LINE #ifndef DONT_PARSE_COMMAND_LINE
show_help: show_help:
prog =("%s" prog = (char *) ("%s"
PROGRAM_LC " [<option> ...] <argument> ...\n" PROGRAM_LC " [<option> ...] <argument> ...\n"
# ifndef RACKET_CMD_LINE # ifndef RACKET_CMD_LINE
# ifdef wx_x # ifdef wx_x

View File

@ -126,7 +126,7 @@ AO_test_and_set_full(volatile AO_TS_t *addr)
/* Note: the "xchg" instruction does not need a "lock" prefix */ /* Note: the "xchg" instruction does not need a "lock" prefix */
__asm__ __volatile__("xchgb %0, %1" __asm__ __volatile__("xchgb %0, %1"
: "=q"(oldval), "=m"(*addr) : "=q"(oldval), "=m"(*addr)
: "0"(0xff), "m"(*addr) : "memory"); : "0"((AO_TS_t) 0xff), "m"(*addr) : "memory");
return (AO_TS_VAL_t)oldval; return (AO_TS_VAL_t)oldval;
} }

View File

@ -161,7 +161,7 @@ char *wxGetTypeName(WXTYPE type)
wxTypeDef *typ; wxTypeDef *typ;
if (type == wxTYPE_ANY) if (type == wxTYPE_ANY)
return "any"; return (char *) "any";
typ = (wxTypeDef *)wxAllTypes->Get((long)type); typ = (wxTypeDef *)wxAllTypes->Get((long)type);
if (!typ) if (!typ)
return NULL; return NULL;

View File

@ -36,7 +36,7 @@ char *wxGetUserHome(const char *user)
struct passwd *who = NULL; struct passwd *who = NULL;
if (user == NULL || *user == '\0') { if (user == NULL || *user == '\0') {
register char *ptr; char *ptr;
if ((ptr = getenv("HOME")) != NULL) if ((ptr = getenv("HOME")) != NULL)
return ptr; return ptr;

View File

@ -509,8 +509,8 @@ CCELL *create_colorcell(int r1, int g1, int b1,
/*******************************/ /*******************************/
{ {
register int i,tmp, dist; register int i,tmp, dist;
register CCELL *ptr; CCELL *ptr;
register byte *rp,*gp,*bp; byte *rp,*gp,*bp;
int ir,ig,ib, mindist; int ir,ig,ib, mindist;
ir = r1 >> (COLOR_DEPTH-C_DEPTH); ir = r1 >> (COLOR_DEPTH-C_DEPTH);
@ -661,7 +661,7 @@ static void map_colortable(byte *r, byte *g, byte *b)
int wxImage::quant_fsdither() int wxImage::quant_fsdither()
/*****************************/ /*****************************/
{ {
register int *thisptr, *nextptr; int *thisptr, *nextptr;
int *thisline, *nextline, *tmpptr; int *thisline, *nextline, *tmpptr;
int r1, g1, b1, r2, g2, b2; int r1, g1, b1, r2, g2, b2;
int i, j, imax, jmax, oval; int i, j, imax, jmax, oval;

View File

@ -108,7 +108,7 @@ int filesize;
int wxImage::LoadGIF(char *fname, int /* nc */) int wxImage::LoadGIF(char *fname, int /* nc */)
{ {
register byte ch, ch1; register byte ch, ch1;
register byte *ptr, *ptr1, *picptr; byte *ptr, *ptr1, *picptr;
register int i; register int i;
int npixels, maxpixels; int npixels, maxpixels;