got rid of a zillion warnings on gcc
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5958 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
f56537a20b
commit
a203e2e981
10 changed files with 41 additions and 41 deletions
|
@ -933,7 +933,7 @@ int CEXEBuild::add_label(const char *name)
|
|||
if (*name == '.') ERROR_MSG("Error: global label \"%s\" already declared\n",name);
|
||||
else
|
||||
{
|
||||
char *t = "section";
|
||||
const char *t = "section";
|
||||
if (build_cursection_isfunc)
|
||||
t = "function";
|
||||
ERROR_MSG("Error: label \"%s\" already declared in %s\n",name,t);
|
||||
|
@ -1485,7 +1485,7 @@ int CEXEBuild::resolve_coderefs(const char *str)
|
|||
// resolve callbacks
|
||||
{
|
||||
struct {
|
||||
char *name;
|
||||
const char *name;
|
||||
int *p;
|
||||
} callbacks[] = {
|
||||
{"%s.onInit", &cur_header->code_onInit},
|
||||
|
@ -1604,7 +1604,7 @@ int CEXEBuild::add_page(int type)
|
|||
struct {
|
||||
int wndproc_id;
|
||||
int dlg_id;
|
||||
char *name;
|
||||
const char *name;
|
||||
} ids[] = {
|
||||
{PWP_CUSTOM, 0, "custom"}, // custom
|
||||
#ifdef NSIS_CONFIG_LICENSEPAGE
|
||||
|
@ -1680,7 +1680,7 @@ int CEXEBuild::AddVersionInfo()
|
|||
LANGID lang_id = rVersionInfo.GetLangID(i);
|
||||
int code_page = rVersionInfo.GetCodePage(i);
|
||||
|
||||
char *lang_name = GetLangNameAndCP(lang_id);
|
||||
const char *lang_name = GetLangNameAndCP(lang_id);
|
||||
|
||||
if ( !rVersionInfo.FindKey(lang_id, code_page, "FileVersion") )
|
||||
warning("Generating version information for language \"%04d-%s\" without standard key \"FileVersion\"", lang_id, lang_name);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue