diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2011-03-14 23:06:40 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2011-03-14 23:53:46 +0100 |
commit | 431853c84644c02e6bff1b325af5e94d3b1eacc6 (patch) | |
tree | 7206df22625034211ab120c590bb81792fac3d28 /source4/heimdal/lib/asn1/lex.c | |
parent | 8dfa224c1350a9cb3a2d35fae7721bebecfe7934 (diff) | |
download | samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.tar.gz samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.tar.bz2 samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.zip |
Merge new lorikeet heimdal, revision 85ed7247f515770c73b1f1ced1739f6ce19d75d2
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon Mar 14 23:53:46 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/heimdal/lib/asn1/lex.c')
-rw-r--r-- | source4/heimdal/lib/asn1/lex.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/source4/heimdal/lib/asn1/lex.c b/source4/heimdal/lib/asn1/lex.c index 067ce30a61..12c71b7e2e 100644 --- a/source4/heimdal/lib/asn1/lex.c +++ b/source4/heimdal/lib/asn1/lex.c @@ -54,7 +54,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -141,7 +142,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. @@ -848,7 +857,7 @@ static unsigned lineno = 1; static void unterminated(const char *, unsigned); /* This is for broken old lexes (solaris 10 and hpux) */ -#line 851 "lex.c" +#line 860 "lex.c" #define INITIAL 0 @@ -929,7 +938,12 @@ static int input (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. */ @@ -948,7 +962,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - unsigned n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1032,7 +1046,7 @@ YY_DECL #line 68 "lex.l" -#line 1035 "lex.c" +#line 1049 "lex.c" if ( !(yy_init) ) { @@ -1701,7 +1715,7 @@ YY_RULE_SETUP #line 274 "lex.l" ECHO; YY_BREAK -#line 1704 "lex.c" +#line 1718 "lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2459,8 +2473,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() 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. */ |