TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

more generic fix for flex version

Browse Source
This commit is contained in:
David Rose 2009-08-31 20:05:45 +00:00
parent 870e983ae6
commit 3c79e6b042
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/egg/lexer.lxx
View File

@ -162,7 +162,7 @@ eggyywarning(ostringstream &strm) {
// Now define a function to take input from an istream instead of a
// stdio FILE pointer. This is flex-specific.
static void
input_chars(char *buffer, yy_size_t &result, int max_size) {
input_chars(char *buffer, int &result, int max_size) {
nassertv(inp != NULL);
if (*inp) {
inp->read(buffer, max_size);
@ -193,7 +193,14 @@ input_chars(char *buffer, yy_size_t &result, int max_size) {
Thread::consider_yield();
}
#undef YY_INPUT
#define YY_INPUT(buffer, result, max_size) input_chars(buffer, result, max_size)
// Define this macro carefully, since different flex versions call it
// with a different type for result.
#define YY_INPUT(buffer, result, max_size) { \
int int_result; \
input_chars((buffer), int_result, (max_size)); \
(result) = int_result; \
}
// read_char reads and returns a single character, incrementing the
// supplied line and column numbers as appropriate. A convenience