[Forensics-changes] [yara] 84/407: Function 'input' is called 'yyinput' in C++

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.3.0
in repository yara.

commit 88a25d2af1058b288c0fa4217314b1d4552d4bf0
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Tue Oct 7 16:48:02 2014 +0200

    Function 'input' is called 'yyinput' in C++
---
 libyara/re_lexer.c | 10 ++++++++++
 libyara/re_lexer.l | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/libyara/re_lexer.c b/libyara/re_lexer.c
index 2de51e7..d89ee38 100644
--- a/libyara/re_lexer.c
+++ b/libyara/re_lexer.c
@@ -2424,12 +2424,22 @@ uint8_t read_escaped_char(yyscan_t yyscanner)
   char text[4];
 
   text[0] = '\\';
+
+  #ifdef __cplusplus
+  text[1] = yyinput(yyscanner);
+  #else
   text[1] = input(yyscanner);
+  #endif
 
   if (text[1] == 'x')
   {
+    #ifdef __cplusplus
+    text[2] = yyinput(yyscanner);
+    text[3] = yyinput(yyscanner);
+    #else
     text[2] = input(yyscanner);
     text[3] = input(yyscanner);
+    #endif
   }
 
   return escaped_char_value(text);
diff --git a/libyara/re_lexer.l b/libyara/re_lexer.l
index ff52d17..7c500bf 100644
--- a/libyara/re_lexer.l
+++ b/libyara/re_lexer.l
@@ -438,12 +438,22 @@ uint8_t read_escaped_char(yyscan_t yyscanner)
   char text[4];
 
   text[0] = '\\';
+
+  #ifdef __cplusplus
+  text[1] = yyinput(yyscanner);
+  #else
   text[1] = input(yyscanner);
+  #endif
 
   if (text[1] == 'x')
   {
+    #ifdef __cplusplus
+    text[2] = yyinput(yyscanner);
+    text[3] = yyinput(yyscanner);
+    #else
     text[2] = input(yyscanner);
     text[3] = input(yyscanner);
+    #endif
   }
 
   return escaped_char_value(text);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git