- Sync to Wine 1.3.29 to fix a warning

svn path=/trunk/; revision=53824
This commit is contained in:
Rafal Harabien 2011-09-24 07:58:49 +00:00
parent acee43d271
commit bf4b896e65
3 changed files with 3 additions and 3 deletions

View file

@ -680,7 +680,7 @@ void pp_writestring(const char *format, ...)
<pp_iqs,pp_dqs,pp_sqs>\n {
newline(1);
add_string(ppy_text, ppy_leng);
ppy_warning("Newline in string constant encounterd (started line %d)", string_start());
ppy_warning("Newline in string constant encountered (started line %d)", string_start());
}
/*

View file

@ -729,7 +729,7 @@ static const struct wpp_callbacks default_callbacks =
wpp_default_warning,
};
struct wpp_callbacks *wpp_callbacks = &default_callbacks;
const struct wpp_callbacks *wpp_callbacks = &default_callbacks;
int ppy_error(const char *s, ...)
{

View file

@ -218,7 +218,7 @@ int pp_get_if_depth(void);
#define __attribute__(x) /*nothing*/
#endif
extern struct wpp_callbacks *wpp_callbacks;
extern const struct wpp_callbacks *wpp_callbacks;
int ppy_error(const char *s, ...) __attribute__((format (printf, 1, 2)));
int ppy_warning(const char *s, ...) __attribute__((format (printf, 1, 2)));