diff options
| author | Ivy Snow <ivy@sgri.net> | 2017-12-26 12:43:00 +0800 |
|---|---|---|
| committer | Ivy Snow <ivy@sgri.net> | 2017-12-26 12:43:00 +0800 |
| commit | c8cddb849a658156fbeeee42044f670da5c648a1 (patch) | |
| tree | fa5ae480070a9cc2c36cc9f31de1d20bbd5f391a /ports/libconfig/fix-scanner-header-msvc-patch.patch | |
| parent | 544e99310d9f183b4add85c360de2df65ba64598 (diff) | |
| download | vcpkg-c8cddb849a658156fbeeee42044f670da5c648a1.tar.gz vcpkg-c8cddb849a658156fbeeee42044f670da5c648a1.zip | |
[libconfig] update to 1.7.1
Diffstat (limited to 'ports/libconfig/fix-scanner-header-msvc-patch.patch')
| -rw-r--r-- | ports/libconfig/fix-scanner-header-msvc-patch.patch | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/ports/libconfig/fix-scanner-header-msvc-patch.patch b/ports/libconfig/fix-scanner-header-msvc-patch.patch deleted file mode 100644 index c2e13c2ff..000000000 --- a/ports/libconfig/fix-scanner-header-msvc-patch.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/lib/scanner.h b/lib/scanner.h -index cdca3bb..1fc0509 100644 ---- a/lib/scanner.h -+++ b/lib/scanner.h -@@ -13,7 +13,7 @@ - #define FLEX_SCANNER - #define YY_FLEX_MAJOR_VERSION 2 - #define YY_FLEX_MINOR_VERSION 5 --#define YY_FLEX_SUBMINOR_VERSION 39 -+#define YY_FLEX_SUBMINOR_VERSION 35 - #if YY_FLEX_SUBMINOR_VERSION > 0 - #define FLEX_BETA - #endif -@@ -132,7 +132,15 @@ typedef void* yyscan_t; - - /* Size of default input buffer. */ - #ifndef YY_BUF_SIZE -+#ifdef __ia64__ -+/* On IA-64, the buffer size is 16k, not 8k. -+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. -+ * Ditto for the __ia64__ case accordingly. -+ */ -+#define YY_BUF_SIZE 32768 -+#else - #define YY_BUF_SIZE 16384 -+#endif /* __ia64__ */ - #endif - - #ifndef YY_TYPEDEF_YY_BUFFER_STATE -@@ -162,7 +170,7 @@ struct yy_buffer_state - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ -- yy_size_t yy_n_chars; -+ int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to -@@ -206,13 +214,13 @@ void libconfig_yypop_buffer_state (yyscan_t yyscanner ); - - YY_BUFFER_STATE libconfig_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); - YY_BUFFER_STATE libconfig_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); --YY_BUFFER_STATE libconfig_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); -+YY_BUFFER_STATE libconfig_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); - - void *libconfig_yyalloc (yy_size_t ,yyscan_t yyscanner ); - void *libconfig_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); - void libconfig_yyfree (void * ,yyscan_t yyscanner ); - --#define libconfig_yywrap(yyscanner) 1 -+#define libconfig_yywrap(n) 1 - #define YY_SKIP_YYWRAP - - #define yytext_ptr yytext_r -@@ -221,7 +229,8 @@ void libconfig_yyfree (void * ,yyscan_t yyscanner ); - #define INITIAL 0 - #define COMMENT 1 - #define STRING 2 --#define INCLUDE 3 -+#define INCLUDE_F 3 -+#define INCLUDE_D 4 - - #endif - -@@ -260,7 +269,7 @@ FILE *libconfig_yyget_out (yyscan_t yyscanner ); - - void libconfig_yyset_out (FILE * out_str ,yyscan_t yyscanner ); - --yy_size_t libconfig_yyget_leng (yyscan_t yyscanner ); -+int libconfig_yyget_leng (yyscan_t yyscanner ); - - char *libconfig_yyget_text (yyscan_t yyscanner ); - -@@ -268,10 +277,6 @@ int libconfig_yyget_lineno (yyscan_t yyscanner ); - - void libconfig_yyset_lineno (int line_number ,yyscan_t yyscanner ); - --int libconfig_yyget_column (yyscan_t yyscanner ); -- --void libconfig_yyset_column (int column_no ,yyscan_t yyscanner ); -- - YYSTYPE * libconfig_yyget_lval (yyscan_t yyscanner ); - - void libconfig_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); -@@ -302,7 +307,12 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); - - /* Amount of stuff to slurp up with each read. */ - #ifndef YY_READ_BUF_SIZE -+#ifdef __ia64__ -+/* On IA-64, the buffer size is 16k, not 8k */ -+#define YY_READ_BUF_SIZE 16384 -+#else - #define YY_READ_BUF_SIZE 8192 -+#endif /* __ia64__ */ - #endif - - /* Number of entries by which start-condition stack grows. */ -@@ -337,8 +347,8 @@ extern int libconfig_yylex \ - #undef YY_DECL - #endif - --#line 207 "scanner.l" -+#line 315 "scanner.l" - --#line 343 "scanner.h" -+#line 353 "scanner.h" - #undef libconfig_yyIN_HEADER - #endif /* libconfig_yyHEADER_H */ |
