Integrate properties into surf_resource_t

[simgrid.git] / src / surf / simgrid_dtd.c

diff --git a/src/surf/simgrid_dtd.c b/src/surf/simgrid_dtd.c
index 7c41712..99364c1 100644 (file)
--- a/src/surf/simgrid_dtd.c
+++ b/src/surf/simgrid_dtd.c
@@ -39,9 +39,7 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-#ifdef WIN32
-#include <io.h>
-#endif
+
 /* end standard C headers. */
 
 /* flex integer type definitions */
@@ -162,7 +160,15 @@ typedef unsigned int flex_uint32_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
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -3321,7 +3327,12 @@ static void yy_pop_state(void);
 
 /* 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
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -6110,9 +6121,7 @@ void surf_parse__delete_buffer(YY_BUFFER_STATE b)
 }
 
 #ifndef __cplusplus
-#ifndef WIN32
 extern int isatty(int);
-#endif
 #endif /* __cplusplus */
 
 /* Initializes or reinitializes a buffer.
@@ -6320,8 +6329,8 @@ YY_BUFFER_STATE surf_parse__scan_string(yyconst char *yystr)
 
 /** Setup the input buffer state to scan the given bytes. The next call to surf_parse_lex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */