[Forensics-changes] [yara] 47/135: Add missing includes in Windows

[Hilko Bengen]

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

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

commit 609ee5a1b3c7ffd5e13376d394b86259fdf88abd
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Fri Jul 4 13:56:37 2014 +0200

    Add missing includes in Windows
---
 libyara/hex_lexer.c |  1 +
 libyara/hex_lexer.l |  1 +
 libyara/libyara.c   | 12 +++++-------
 libyara/re_lexer.c  |  1 +
 libyara/re_lexer.l  |  1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libyara/hex_lexer.c b/libyara/hex_lexer.c
index d3240ea..14e83b1 100644
--- a/libyara/hex_lexer.c
+++ b/libyara/hex_lexer.c
@@ -2084,6 +2084,7 @@ void hex_yyfree (void * ptr , yyscan_t yyscanner)
 
 
 #ifdef WIN32
+#include <windows.h>
 extern DWORD recovery_state_key;
 #else
 #include <pthread.h>
diff --git a/libyara/hex_lexer.l b/libyara/hex_lexer.l
index 449978e..85c0915 100644
--- a/libyara/hex_lexer.l
+++ b/libyara/hex_lexer.l
@@ -139,6 +139,7 @@ hexdigit      [a-fA-F0-9]
 
 
 #ifdef WIN32
+#include <windows.h>
 extern DWORD recovery_state_key;
 #else
 #include <pthread.h>
diff --git a/libyara/libyara.c b/libyara/libyara.c
index b0743c2..8958bf6 100644
--- a/libyara/libyara.c
+++ b/libyara/libyara.c
@@ -26,23 +26,21 @@ limitations under the License.
 #define snprintf _snprintf
 #endif
 
-#ifdef WIN32
-#else
-#include <pthread.h>
-#endif
-
-char lowercase[256];
-char altercase[256];
 
 #ifdef WIN32
+#include <windows.h>
 DWORD tidx_key;
 DWORD recovery_state_key;
 #else
+#include <pthread.h>
 pthread_key_t tidx_key;
 pthread_key_t recovery_state_key;
 #endif
 
 
+char lowercase[256];
+char altercase[256];
+
 //
 // yr_initialize
 //
diff --git a/libyara/re_lexer.c b/libyara/re_lexer.c
index 1442502..cb60598 100644
--- a/libyara/re_lexer.c
+++ b/libyara/re_lexer.c
@@ -2444,6 +2444,7 @@ uint8_t read_escaped_char(yyscan_t yyscanner)
 
 
 #ifdef WIN32
+#include <windows.h>
 extern DWORD recovery_state_key;
 #else
 #include <pthread.h>
diff --git a/libyara/re_lexer.l b/libyara/re_lexer.l
index 1a9bf97..e52d374 100644
--- a/libyara/re_lexer.l
+++ b/libyara/re_lexer.l
@@ -450,6 +450,7 @@ uint8_t read_escaped_char(yyscan_t yyscanner)
 
 
 #ifdef WIN32
+#include <windows.h>
 extern DWORD recovery_state_key;
 #else
 #include <pthread.h>

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