From ac61dd627ab10f1393c2b15a228134c9dfc5379e Mon Sep 17 00:00:00 2001
From: Victor Manuel Alvarez <vmalvarez@virustotal.com>
Date: Thu, 16 Jan 2014 18:07:09 +0100
Subject: [PATCH] Fix header guards to comply with standards

---
 libyara/arena.h    | 4 ++--
 libyara/atoms.h    | 4 ++--
 libyara/compiler.h | 4 ++--
 libyara/exec.h     | 4 ++--
 libyara/exefiles.h | 4 ++--
 libyara/filemap.h  | 3 +++
 libyara/hash.h     | 4 ++--
 libyara/mem.h      | 4 ++--
 libyara/parser.h   | 4 ++--
 libyara/proc.h     | 4 ++--
 libyara/re.h       | 4 ++--
 libyara/utils.h    | 4 ++--
 libyara/yara.h     | 4 ++--
 13 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/libyara/arena.h b/libyara/arena.h
index d306926890..4683ee1ef2 100644
--- a/libyara/arena.h
+++ b/libyara/arena.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _ARENA_H
-#define _ARENA_H
+#ifndef YR_ARENA_H
+#define YR_ARENA_H
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/libyara/atoms.h b/libyara/atoms.h
index c65604f5dd..c30d9f61cf 100644
--- a/libyara/atoms.h
+++ b/libyara/atoms.h
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 
-#ifndef _ATOMS_H
-#define _ATOMS_H
+#ifndef YR_ATOMS_H
+#define YR_ATOMS_H
 
 #include "re.h"
 #include "yara.h"
diff --git a/libyara/compiler.h b/libyara/compiler.h
index 25e3e17ae0..c02d86bff6 100644
--- a/libyara/compiler.h
+++ b/libyara/compiler.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _COMPILER_H
-#define _COMPILER_H
+#ifndef YR_COMPILER_H
+#define YR_COMPILER_H
 
 #include <stdio.h>
 
diff --git a/libyara/exec.h b/libyara/exec.h
index f4b10db12a..25fcde7b55 100644
--- a/libyara/exec.h
+++ b/libyara/exec.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _EXEC_H
-#define _EXEC_H
+#ifndef YR_EXEC_H
+#define YR_EXEC_H
 
 #include "yara.h"
 
diff --git a/libyara/exefiles.h b/libyara/exefiles.h
index ccd4144413..fc54020bc8 100644
--- a/libyara/exefiles.h
+++ b/libyara/exefiles.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _EXEFILES_H
-#define _EXEFILES_H
+#ifndef YR_EXEFILES_H
+#define YR_EXEFILES_H
 
 int yr_file_is_pe(
 		uint8_t* buffer,
diff --git a/libyara/filemap.h b/libyara/filemap.h
index ed866eb319..30aa4718e8 100755
--- a/libyara/filemap.h
+++ b/libyara/filemap.h
@@ -14,6 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+#ifndef YR_FILEMAP_H
+#define YR_FILEMAP_H
+
 #ifdef WIN32
 #include <windows.h>
 #define FILE_DESCRIPTOR         HANDLE
diff --git a/libyara/hash.h b/libyara/hash.h
index dcbbbe0338..5edcce5cf3 100644
--- a/libyara/hash.h
+++ b/libyara/hash.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _HASH_H
-#define _HASH_H
+#ifndef YR_HASH_H
+#define YR_HASH_H
 
 #include "yara.h"
 
diff --git a/libyara/mem.h b/libyara/mem.h
index a80f53fecd..9705d3a265 100644
--- a/libyara/mem.h
+++ b/libyara/mem.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _MEM_H
-#define _MEM_H
+#ifndef YR_MEM_H
+#define YR_MEM_H
 
 #include <stdio.h>
 
diff --git a/libyara/parser.h b/libyara/parser.h
index 83537d446a..e9adb7c3fb 100644
--- a/libyara/parser.h
+++ b/libyara/parser.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _PARSER_H
-#define _PARSER_H
+#ifndef YR_PARSER_H
+#define YR_PARSER_H
 
 #include "arena.h"
 #include "compiler.h"
diff --git a/libyara/proc.h b/libyara/proc.h
index 7a23bde043..e66dd0e6d7 100644
--- a/libyara/proc.h
+++ b/libyara/proc.h
@@ -15,8 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _PROC_H
-#define _PROC_H
+#ifndef YR_PROC_H
+#define YR_PROC_H
 
 #include "yara.h"
 
diff --git a/libyara/re.h b/libyara/re.h
index 2cfbb54ca6..ffc3fd4c9e 100644
--- a/libyara/re.h
+++ b/libyara/re.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _RE_H
-#define _RE_H
+#ifndef YR_RE_H
+#define YR_RE_H
 
 #include "yara.h"
 #include "sizedstr.h"
diff --git a/libyara/utils.h b/libyara/utils.h
index 4e24453bff..9fff3c1a43 100644
--- a/libyara/utils.h
+++ b/libyara/utils.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _UTILS_H
-#define _UTILS_H
+#ifndef YR_UTILS_H
+#define YR_UTILS_H
 
 size_t xtoi(const char* hexstr);
 
diff --git a/libyara/yara.h b/libyara/yara.h
index 2f6a6ff4f4..854e5765c7 100644
--- a/libyara/yara.h
+++ b/libyara/yara.h
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef _YARA_H
-#define _YARA_H
+#ifndef YR_YARA_H
+#define YR_YARA_H
 
 #include <stdio.h>
 #include <stdint.h>