From fb010bc7d6c5c9cbea162c1439beb20d086efae2 Mon Sep 17 00:00:00 2001 From: Thomas Jensen Date: Thu, 15 Apr 2021 20:52:58 +0200 Subject: [PATCH] Remove lexer.l special around input_t in boxes.h #78 --- src/boxes.in.h | 3 --- src/lexer.l | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/boxes.in.h b/src/boxes.in.h index d030293..d3a5716 100644 --- a/src/boxes.in.h +++ b/src/boxes.in.h @@ -156,8 +156,6 @@ typedef struct { size_t *posmap; /* for each character in `text`, position of corresponding char in `mbtext`. Needed for box removal. */ } line_t; - -#ifndef FILE_LEXER_L typedef struct { line_t *lines; size_t anz_lines; /* number of entries in input */ @@ -169,7 +167,6 @@ typedef struct { #define INPUT_INITIALIZER {NULL, 0, 0, LINE_MAX_BYTES, 0} extern input_t input; -#endif /*!FILE_LEXER_L*/ #endif /* BOXES_H */ diff --git a/src/lexer.l b/src/lexer.l index 5c5d500..b383d08 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -60,10 +60,8 @@ void inflate_inbuf(void *yyscanner, const char *configfile); #include #include -#include "shape.h" -#define FILE_LEXER_L #include "boxes.h" -#undef FILE_LEXER_L +#include "shape.h" #include "tools.h" #include "parsing.h" #include "parser.h"