summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-04-08 19:35:34 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-04-08 19:35:34 (GMT)
commitae846315702f9b038c3c0ed7c6d565f179d45a05 (patch)
treefcf48e002b854c12189f1221cb306f5171c5a79a /hl
parent9cd1a1bb60c66650208033d61ff377df5ac1a72e (diff)
downloadhdf5-ae846315702f9b038c3c0ed7c6d565f179d45a05.zip
hdf5-ae846315702f9b038c3c0ed7c6d565f179d45a05.tar.gz
hdf5-ae846315702f9b038c3c0ed7c6d565f179d45a05.tar.bz2
[svn-r24987] HDFFV-8709, HDFFV-8776, HDFFV-8777, HDFFV-8778
Apply user patches, regenerate and patch results for windows. Miminum changes tested locally
Diffstat (limited to 'hl')
-rw-r--r--hl/src/H5LTanalyze.c6
-rw-r--r--hl/src/H5LTanalyze.l4
-rw-r--r--hl/src/H5LTparse.c22
-rw-r--r--hl/src/H5LTparse.y10
4 files changed, 23 insertions, 19 deletions
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index 560a8ce..31ec84f 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -809,7 +809,7 @@ char *yytext;
#line 17 "H5LTanalyze.l"
#include <stdlib.h>
#include <string.h>
-#include<hdf5.h>
+#include <hdf5.h>
#include "H5LTparse.h"
int my_yyinput(char *, int);
@@ -1453,7 +1453,7 @@ YY_RULE_SETUP
#line 174 "H5LTanalyze.l"
ECHO;
YY_BREAK
-#line 1432 "H5LTanalyze.c"
+#line 1457 "H5LTanalyze.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(TAG_STRING):
yyterminate();
@@ -2345,7 +2345,7 @@ int my_yyinput(char *buf, int max_size)
return ret;
}
-int H5LTyyerror(char *msg)
+int H5LTyyerror(const char *msg)
{
printf("ERROR: %s before \"%s\".\n", msg, yytext);
return 0;
diff --git a/hl/src/H5LTanalyze.l b/hl/src/H5LTanalyze.l
index 7407520..9682f78 100644
--- a/hl/src/H5LTanalyze.l
+++ b/hl/src/H5LTanalyze.l
@@ -16,7 +16,7 @@
%{
#include <stdlib.h>
#include <string.h>
-#include<hdf5.h>
+#include <hdf5.h>
#include "H5LTparse.h"
int my_yyinput(char *, int);
@@ -181,7 +181,7 @@ int my_yyinput(char *buf, int max_size)
return ret;
}
-int H5LTyyerror(char *msg)
+int H5LTyyerror(const char *msg)
{
printf("ERROR: %s before \"%s\".\n", msg, yytext);
return 0;
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 41c4cec..4527a5f 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -58,12 +58,12 @@ static int yygrowstack();
#define yystacksize H5LTyystacksize
#define YYPREFIX "H5LTyy"
#line 17 "H5LTparse.y"
-#include<stdio.h>
-#include<string.h>
-#include<hdf5.h>
+#include <stdio.h>
+#include <string.h>
+#include <hdf5.h>
extern int yylex();
-extern int yyerror(char *);
+extern int yyerror(const char *);
#define STACK_SIZE 16
@@ -95,7 +95,7 @@ int asindex = -1; /*pointer to the top of array stack*/
hbool_t is_str_size = 0; /*flag to lexer for string size*/
hbool_t is_str_pad = 0; /*flag to lexer for string padding*/
-H5T_pad_t str_pad; /*variable for string padding*/
+H5T_str_t str_pad; /*variable for string padding*/
H5T_cset_t str_cset; /*variable for string character set*/
hbool_t is_variable = 0; /*variable for variable-length string*/
size_t str_size; /*variable for string size*/
@@ -113,7 +113,7 @@ typedef union {
int ival; /*for integer token*/
char *sval; /*for name string*/
} YYSTYPE;
-#line 99 "H5LTparse.c"
+#line 117 "H5LTparse.c"
#define YYERRCODE 256
#define H5T_STD_I8BE_TOKEN 257
#define H5T_STD_I8LE_TOKEN 258
@@ -1042,11 +1042,15 @@ case 91:
#line 330 "H5LTparse.y"
{
is_enum_memb = 1; /*indicate member of enum*/
- enum_memb_symbol = strdup(yylval.sval);
+#ifdef H5_HAVE_WIN32_API
+ enum_memb_symbol = _strdup(yylval.sval);
+#else /* H5_HAVE_WIN32_API */
+ enum_memb_symbol = strdup(yylval.sval);
+#endif /* H5_HAVE_WIN32_API */
}
break;
case 92:
-#line 335 "H5LTparse.y"
+#line 339 "H5LTparse.y"
{
char char_val=(char)yylval.ival;
short short_val=(short)yylval.ival;
@@ -1090,7 +1094,7 @@ case 92:
H5Tclose(native);
}
break;
-#line 1076 "H5LTparse.c"
+#line 1098 "H5LTparse.c"
}
yyssp -= yym;
yystate = *yyssp;
diff --git a/hl/src/H5LTparse.y b/hl/src/H5LTparse.y
index b91e97e..d4c786c 100644
--- a/hl/src/H5LTparse.y
+++ b/hl/src/H5LTparse.y
@@ -14,12 +14,12 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
%{
-#include<stdio.h>
-#include<string.h>
-#include<hdf5.h>
+#include <stdio.h>
+#include <string.h>
+#include <hdf5.h>
extern int yylex();
-extern int yyerror(char *);
+extern int yyerror(const char *);
#define STACK_SIZE 16
@@ -51,7 +51,7 @@ int asindex = -1; /*pointer to the top of array stack*/
hbool_t is_str_size = 0; /*flag to lexer for string size*/
hbool_t is_str_pad = 0; /*flag to lexer for string padding*/
-H5T_pad_t str_pad; /*variable for string padding*/
+H5T_str_t str_pad; /*variable for string padding*/
H5T_cset_t str_cset; /*variable for string character set*/
hbool_t is_variable = 0; /*variable for variable-length string*/
size_t str_size; /*variable for string size*/