[Forensics-changes] [yara] 08/368: Fix name collision while compiling in Windows

[Hilko Bengen]

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

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

commit 47b1d081e0fa7384e94aa14ab897ff33737ead5a
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Tue Jun 30 11:39:49 2015 +0200

    Fix name collision while compiling in Windows
---
 libyara/re_lexer.c | 10 +++++-----
 libyara/re_lexer.l | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libyara/re_lexer.c b/libyara/re_lexer.c
index 8c6fe75..9690890 100644
--- a/libyara/re_lexer.c
+++ b/libyara/re_lexer.c
@@ -2494,9 +2494,9 @@ uint8_t escaped_char_value(
 
 
 #ifdef __cplusplus
-#define INPUT yyinput
+#define RE_YY_INPUT yyinput
 #else
-#define INPUT input
+#define RE_YY_INPUT input
 #endif
 
 
@@ -2507,19 +2507,19 @@ int read_escaped_char(
   char text[4];
 
   text[0] = '\\';
-  text[1] = INPUT(yyscanner);
+  text[1] = RE_YY_INPUT(yyscanner);
 
   if (text[1] == EOF)
     return 0;
 
   if (text[1] == 'x')
   {
-    text[2] = INPUT(yyscanner);
+    text[2] = RE_YY_INPUT(yyscanner);
 
     if (text[2] == EOF)
       return 0;
 
-    text[3] = INPUT(yyscanner);
+    text[3] = RE_YY_INPUT(yyscanner);
 
     if (text[3] == EOF)
       return 0;
diff --git a/libyara/re_lexer.l b/libyara/re_lexer.l
index 6be9d54..9cbcb91 100644
--- a/libyara/re_lexer.l
+++ b/libyara/re_lexer.l
@@ -486,9 +486,9 @@ uint8_t escaped_char_value(
 
 
 #ifdef __cplusplus
-#define INPUT yyinput
+#define RE_YY_INPUT yyinput
 #else
-#define INPUT input
+#define RE_YY_INPUT input
 #endif
 
 
@@ -499,19 +499,19 @@ int read_escaped_char(
   char text[4];
 
   text[0] = '\\';
-  text[1] = INPUT(yyscanner);
+  text[1] = RE_YY_INPUT(yyscanner);
 
   if (text[1] == EOF)
     return 0;
 
   if (text[1] == 'x')
   {
-    text[2] = INPUT(yyscanner);
+    text[2] = RE_YY_INPUT(yyscanner);
 
     if (text[2] == EOF)
       return 0;
 
-    text[3] = INPUT(yyscanner);
+    text[3] = RE_YY_INPUT(yyscanner);
 
     if (text[3] == EOF)
       return 0;

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