logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

yyin.patch (1286B)

    

  1. SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
  2. SPDX-FileCopyrightText: 2019-2020 Giovanni Mascellani <gio@debian.org>
  3. SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
  5. SPDX-License-Identifier: BSD-2-Clause
  7. yyin has an odd redefinition error in scan.l, so we ensure that we don't
  8. acidentally re-declare it.
  10. diff --git flexdef.h flexdef.h
  11. index 3eb710a..94ef024 100644
  12. --- flex-2.5.11/flexdef.h
  13. +++ flex-2.5.11/flexdef.h
  14. @@ -421,7 +421,7 @@ extern int yymore_really_used, reject_really_used;
  15.   */
  16.  
  17.  extern int datapos, dataline, linenum, out_linenum;
  18. -extern FILE *skelfile, *yyin, *backing_up_file;
  19. +extern FILE *skelfile, *backing_up_file;
  20.  extern const char *skel[];
  21.  extern int skel_ind;
  22.  extern char *infilename, *outfilename, *headerfilename;
  23. @@ -432,6 +432,10 @@ extern char **input_files;
  24.  extern int num_input_files;
  25.  extern char *program_name;
  26.  
  27. +#ifndef yyin_defined
  28. +extern FILE* yyin;
  29. +#endif
  30. +
  31.  extern char *action_array;
  32.  extern int action_size;
  33.  extern int defs1_offset, prolog_offset, action_offset, action_index;
  34. --- flex-2.5.11/scan.l
  35. +++ flex-2.5.11/scan.l
  36. @@ -32,6 +32,7 @@
  37.  /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
  38.  /*  PURPOSE. */
  39.  
  40. +#define yyin_defined
  41.  #include "flexdef.h"
  42.  #include "parse.h"
  43.