diff --git a/libs/wine/debug.c b/libs/wine/debug.c index d965983059f..7419cb216bd 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -143,12 +143,13 @@ void wine_dbg_add_option( const char *name, unsigned char set, unsigned char cle /* parse a set of debugging option specifications and add them to the option list */ int wine_dbg_parse_options( const char *str ) { - char *p, *opt, *next, *options; + char *opt, *next, *options; int i, errors = 0; if (!(options = strdup(str))) return -1; for (opt = options; opt; opt = next) { + const char *p; unsigned char set = 0, clear = 0; if ((next = strchr( opt, ',' ))) *next++ = 0; diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index f0f2d467e36..4a6bd16ae3d 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -58,13 +58,13 @@ char* g_lpstrCharSet = NULL; char* g_lpstrInputFile = NULL; int g_outputPoints = 0; -static char* errorDLLRead = "Unable to read Windows DLL.\n"; -static char* errorFNTRead = "Unable to read .FNT file.\n"; -static char* errorOpenFile = "Unable to open file.\n"; -static char* errorMemory = "Memory allocation error.\n"; -static char* errorFile = "Corrupt or invalid file.\n"; -static char* errorFontData = "Unable to parse font data: Error "; -static char* errorEmpty = "No fonts found.\n"; +static const char* errorDLLRead = "Unable to read Windows DLL.\n"; +static const char* errorFNTRead = "Unable to read .FNT file.\n"; +static const char* errorOpenFile = "Unable to open file.\n"; +static const char* errorMemory = "Memory allocation error.\n"; +static const char* errorFile = "Corrupt or invalid file.\n"; +static const char* errorFontData = "Unable to parse font data: Error "; +static const char* errorEmpty = "No fonts found.\n"; /* info */ diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 1d12695742b..ec350df36c7 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -191,7 +191,7 @@ extern int kill_at; extern char *owner_name; extern char *dll_name; extern char *dll_file_name; -extern char *init_func; +extern const char *init_func; extern char *input_file_name; extern const char *output_file_name; extern char **debug_channels; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 1729c5ec3f5..3ac191389ca 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -66,7 +66,7 @@ int debugging = 0; char *owner_name = NULL; char *dll_name = NULL; char *dll_file_name = NULL; -char *init_func = NULL; +const char *init_func = NULL; char **debug_channels = NULL; char **lib_path = NULL; diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4ca72850d4e..7d7272fc790 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -120,7 +120,7 @@ static void function_header( FILE *outfile, const char *name ) */ static void BuildCallFrom16Core( FILE *outfile, int reg_func, int thunk, int short_ret ) { - char *name = thunk? "thunk" : reg_func? "regs" : short_ret? "word" : "long"; + const char *name = thunk? "thunk" : reg_func? "regs" : short_ret? "word" : "long"; /* Function header */ if (thunk) function_header( outfile, "__wine_call_from_16_thunk" ); @@ -753,7 +753,7 @@ static void BuildRet16Func( FILE *outfile ) */ static void BuildCallTo32CBClient( FILE *outfile, BOOL isEx ) { - char *name = isEx? "CBClientEx" : "CBClient"; + const char *name = isEx? "CBClientEx" : "CBClient"; int size = isEx? 24 : 12; /* Function header */ @@ -889,7 +889,7 @@ static void BuildCallTo32CBClient( FILE *outfile, BOOL isEx ) static void BuildCallTo32CBClientRet( FILE *outfile, BOOL isEx ) { - char *name = isEx? "CBClientEx" : "CBClient"; + const char *name = isEx? "CBClientEx" : "CBClient"; /* '16-bit' return stub */ diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index eccff57985c..43188a85bf3 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -346,7 +346,7 @@ static void BuildCallFrom16Func( FILE *outfile, const char *profile, const char int usecdecl = 0; int varargs = 0; const char *args = profile + 7; - char *ret_type; + const char *ret_type; /* Parse function type */