[rharabien] 53824: [WPP] - Sync to Wine 1.3.29 to fix a warning

Author: rharabien
Date: Sat Sep 24 07:58:49 2011
New Revision: 53824

URL: http://svn.reactos.org/svn/reactos?rev=53824&view=rev
Log:
[WPP]
- Sync to Wine 1.3.29 to fix a warning

Modified:
    trunk/reactos/tools/wpp/ppl.l
    trunk/reactos/tools/wpp/preproc.c
    trunk/reactos/tools/wpp/wpp_private.h

Modified: trunk/reactos/tools/wpp/ppl.l
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppl.l?rev=53824&a...
==============================================================================
--- trunk/reactos/tools/wpp/ppl.l [iso-8859-1] (original)
+++ trunk/reactos/tools/wpp/ppl.l [iso-8859-1] Sat Sep 24 07:58:49 2011
@@ -680,7 +680,7 @@
 <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());
    }

/*

Modified: trunk/reactos/tools/wpp/preproc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/preproc.c?rev=538...
==============================================================================
--- trunk/reactos/tools/wpp/preproc.c [iso-8859-1] (original)
+++ trunk/reactos/tools/wpp/preproc.c [iso-8859-1] Sat Sep 24 07:58:49 2011
@@ -729,7 +729,7 @@
    wpp_default_warning,
 };

-struct wpp_callbacks *wpp_callbacks = &default_callbacks;
+const struct wpp_callbacks *wpp_callbacks = &default_callbacks;

int ppy_error(const char *s, ...)
 {

Modified: trunk/reactos/tools/wpp/wpp_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp_private.h?rev...
==============================================================================
--- trunk/reactos/tools/wpp/wpp_private.h [iso-8859-1] (original)
+++ trunk/reactos/tools/wpp/wpp_private.h [iso-8859-1] Sat Sep 24 07:58:49 2011
@@ -218,7 +218,7 @@
 #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)));