From 0b01dd565aa730b395911a06a555aa4f819bfea0 Mon Sep 17 00:00:00 2001
From: Joshua Warner <joshua.warner@readytalk.com>
Date: Thu, 28 Feb 2013 15:57:09 -0700
Subject: [PATCH] fix multiple-include-of-stdint errors

---
 src/avian/common.h                    | 8 ++++----
 src/codegen/target/x86/assembler.cpp  | 1 -
 src/codegen/target/x86/operations.cpp | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/avian/common.h b/src/avian/common.h
index dc5281511c..4fad202fe4 100644
--- a/src/avian/common.h
+++ b/src/avian/common.h
@@ -8,8 +8,8 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef AVIAN_COMMON_H
+#define AVIAN_COMMON_H
 
 #ifndef __STDC_CONSTANT_MACROS
 #  define __STDC_CONSTANT_MACROS
@@ -113,7 +113,7 @@ typedef intptr_t intptr_alias_t;
 
 #else // not _MSC_VER
 
-#  include "stdint.h"
+#  include <stdint.h>
 
 #  define BYTES_PER_WORD __SIZEOF_POINTER__
 
@@ -554,4 +554,4 @@ equal(const void* a, unsigned al, const void* b, unsigned bl)
 
 } // namespace vm
 
-#endif // COMMON_H
+#endif // AVIAN_COMMON_H
diff --git a/src/codegen/target/x86/assembler.cpp b/src/codegen/target/x86/assembler.cpp
index d441c0030b..af289135cf 100644
--- a/src/codegen/target/x86/assembler.cpp
+++ b/src/codegen/target/x86/assembler.cpp
@@ -9,7 +9,6 @@
    details. */
 
 #include <stdarg.h>
-#include <stdint.h>
 #include <string.h>
 
 #include "avian/environment.h"
diff --git a/src/codegen/target/x86/operations.cpp b/src/codegen/target/x86/operations.cpp
index 13f6f1b0d6..477c3a8859 100644
--- a/src/codegen/target/x86/operations.cpp
+++ b/src/codegen/target/x86/operations.cpp
@@ -8,8 +8,6 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <stdint.h>
-
 #include "avian/target.h"
 #include "avian/alloc-vector.h"
 #include "avian/allocator.h"