Fix build problems introduced by r18788

[reactos.git] / reactos / tools / wpp / ppl.l

diff --git a/reactos/tools/wpp/ppl.l b/reactos/tools/wpp/ppl.l
index 6a021ee..37f6c28 100644 (file)
--- a/reactos/tools/wpp/ppl.l
+++ b/reactos/tools/wpp/ppl.l
@@ -163,7 +163,7 @@ ul  [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL]
 #include <assert.h>
 
 #include "wpp_private.h"
-#include "wpp.tab.h"
+#include "ppy.tab.h"
 
 /*
  * Make sure that we are running an appropriate version of flex.
@@ -563,7 +563,6 @@ includelogicentry_t *pp_includelogiclist = NULL;
                        pplval.cptr = get_string();
                        if (is_c_h_include(pplval.cptr, 1)) pass_data=0;
                        else pass_data=1;
-//fprintf(stderr, "%s pass_data %d\n", pplval.cptr, pass_data);
                        return tDQSTRING;
                default:
                        put_string();
@@ -1418,7 +1417,7 @@ static int is_c_h_include(char *fname, int quoted)
        int sl=strlen(fname);
        if (sl < 2 + 2 * quoted) return 0;
        if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0;
-        if (fname[sl-2-quoted]!='.') return 0;
+       if (fname[sl-2-quoted]!='.') return 0;
        return 1;
 }
 
@@ -1449,7 +1448,7 @@ void pp_do_include(char *fname, int type)
        /* Undo the effect of the quotation */
        fname[n-1] = '\0';
 
-       if((ppin = pp_open_include(fname+1, type, &newpath)) == NULL)
+       if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath, type)) == NULL)
                pperror("Unable to open include file %s", fname+1);
 
        fname[n-1] = *fname;    /* Redo the quotes */