Want more features on Pastebin? Sign Up, it's FREE!
Public Pastes
Guest

Untitled

By: a guest on Oct 12th, 2014  |  syntax: Diff  |  size: 1.18 KB  |  views: 229  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print  |  QR code  |  clone
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/cvs.h b/cvs.h
  2. index 2ce17ff..56cf7d6 100644
  3. --- a/cvs.h
  4. +++ b/cvs.h
  5. @@ -724,14 +724,14 @@ void progress_end(const char * /*format*/, ...) _printflike(1, 2);
  6.  
  7.  /* Work around glitches in Bison and Flex */
  8.  
  9. -typedef void *yyscan_t;
  10. +typedef void *yyscan2_t;
  11.  
  12. -int yyget_column (yyscan_t);
  13. -void yyset_column(int, yyscan_t);
  14. +int yyget_column (yyscan2_t);
  15. +void yyset_column(int, yyscan2_t);
  16.  
  17.  /* FIXME: remove once the Bison bug requiring this is fixed */
  18.  #define YY_DECL int yylex \
  19. -       (YYSTYPE * yylval_param , yyscan_t yyscanner, cvs_file *cvs)
  20. +       (YYSTYPE * yylval_param , yyscan2_t yyscanner, cvs_file *cvs)
  21.  
  22.  /*
  23.   * Global options
  24. diff --git a/gram.y b/gram.y
  25. index a8e725b..b077a87 100644
  26. --- a/gram.y
  27. +++ b/gram.y
  28. @@ -18,7 +18,9 @@
  29.   */
  30.  
  31.  #include "cvs.h"
  32. +#define yyscan_t yyscan2_t
  33.  #include "gram.h"
  34. +#undef yyscan_t
  35.  #include "lex.h"
  36.  
  37.  extern int yyerror(yyscan_t, cvs_file *, char *);
  38. diff --git a/import.c b/import.c
  39. index 011ff6d..7f5ae13 100644
  40. --- a/import.c
  41. +++ b/import.c
  42. @@ -23,7 +23,9 @@
  43.  #endif /* THREADS */
  44.  
  45.  #include "cvs.h"
  46. +#define yyscan_t yyscan2_t
  47.  #include "gram.h"
  48. +#undef yyscan_t
  49.  #include "lex.h"
  50.  
  51.  /*
clone this paste RAW Paste Data
Top