[Forensics-changes] [yara] 87/407: Fix minor issues 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.3.0
in repository yara.

commit f69814791ed2506bfa1658b222b5ab859b49bb48
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Thu Oct 9 12:19:38 2014 +0200

    Fix minor issues while compiling in Windows
---
 libyara/exefiles.c         |  5 -----
 libyara/include/yara/elf.h | 12 +-----------
 libyara/modules/elf.c      |  5 -----
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/libyara/exefiles.c b/libyara/exefiles.c
index 74841cf..b74f5a3 100644
--- a/libyara/exefiles.c
+++ b/libyara/exefiles.c
@@ -16,12 +16,7 @@ limitations under the License.
 
 #include <limits.h>
 
-#ifdef _WIN32
-#include <windows.h>
-#else
 #include <yara/pe.h>
-#endif
-
 #include <yara/elf.h>
 #include <yara/exec.h>
 
diff --git a/libyara/include/yara/elf.h b/libyara/include/yara/elf.h
index d2abd69..5f38658 100644
--- a/libyara/include/yara/elf.h
+++ b/libyara/include/yara/elf.h
@@ -17,18 +17,8 @@ limitations under the License.
 #ifndef _ELF_H
 #define _ELF_H
 
-#ifdef _MSC_VER
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
 #include <stdint.h>
-#endif
+
 
 // 32-bit ELF base types
 
diff --git a/libyara/modules/elf.c b/libyara/modules/elf.c
index 35e6a4d..5b92916 100644
--- a/libyara/modules/elf.c
+++ b/libyara/modules/elf.c
@@ -16,12 +16,7 @@ limitations under the License.
 
 #include <limits.h>
 
-#ifdef _WIN32
-#include <windows.h>
-#else
 #include <yara/elf.h>
-#endif
-
 #include <yara/modules.h>
 #include <yara/mem.h>
 

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