From bf4b896e65b6612bde1a0f9e9943f5d610e809a6 Mon Sep 17 00:00:00 2001 From: Rafal Harabien Date: Sat, 24 Sep 2011 07:58:49 +0000 Subject: [PATCH] [WPP] - Sync to Wine 1.3.29 to fix a warning svn path=/trunk/; revision=53824 --- reactos/tools/wpp/ppl.l | 2 +- reactos/tools/wpp/preproc.c | 2 +- reactos/tools/wpp/wpp_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/tools/wpp/ppl.l b/reactos/tools/wpp/ppl.l index 0588e5d9f3f..98f3e1a3b2d 100644 --- a/reactos/tools/wpp/ppl.l +++ b/reactos/tools/wpp/ppl.l @@ -680,7 +680,7 @@ void pp_writestring(const char *format, ...) \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()); } /* diff --git a/reactos/tools/wpp/preproc.c b/reactos/tools/wpp/preproc.c index 7937740f880..99934d69944 100644 --- a/reactos/tools/wpp/preproc.c +++ b/reactos/tools/wpp/preproc.c @@ -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, ...) { diff --git a/reactos/tools/wpp/wpp_private.h b/reactos/tools/wpp/wpp_private.h index 5686bda808d..288d709be36 100644 --- a/reactos/tools/wpp/wpp_private.h +++ b/reactos/tools/wpp/wpp_private.h @@ -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)));