diff options
| author | Stephen Hines <srhines@google.com> | 2014-04-24 14:41:24 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-04-24 15:22:31 -0700 |
| commit | 551ae4ebd3e9d137ea668fb83ae4a55b8cfba451 (patch) | |
| tree | c4ea60679a6fe2630e21bf6d46177b2c4fcab33b /include/mcld/Script | |
| parent | 334c6f83c1265eabd58ac7c8b860898038831eab (diff) | |
| download | mclinker-551ae4ebd3e9d137ea668fb83ae4a55b8cfba451.tar.gz | |
Update MCLinker for LLVM 3.5.
Change-Id: Ib07513d0eb2f8b7d3516a7dd8823f98820943cc9
Diffstat (limited to 'include/mcld/Script')
| -rw-r--r-- | include/mcld/Script/FlexLexer.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/mcld/Script/FlexLexer.h b/include/mcld/Script/FlexLexer.h index d7d8001..f09ab20 100644 --- a/include/mcld/Script/FlexLexer.h +++ b/include/mcld/Script/FlexLexer.h @@ -139,15 +139,8 @@ public: virtual int yywrap(); protected: -// BEGIN android-modified: work around flex differences on Darwin and Linux -#if !defined(DARWIN_FLEX) - virtual int LexerInput( char* buf, int max_size ); - virtual void LexerOutput( const char* buf, int size ); -#else - virtual size_t LexerInput( char* buf, size_t max_size ); - virtual void LexerOutput( const char* buf, size_t size ); -#endif -// END android-modified + virtual int LexerInput( char* buf, int max_size ); + virtual void LexerOutput( const char* buf, int size ); virtual void LexerError( const char* msg ); void yyunput( int c, char* buf_ptr ); |