make stuff compile on openbsd again

clean up a few other things while we're here.

base/bitfield.hh:
base/compression/null_compression.hh:
    dont #include <inttypes.hh> use "sim/host.hh"
    fix #include guard
base/stats/types.hh:
    dont #include <inttypes.hh> use "sim/host.hh"
kern/linux/aligned.hh:
    dont #include <stdint.hh> use "sim/host.hh"
    fix #include guard
kern/linux/hwrpb.hh:
    fix #include guard

--HG--
extra : convert_revision : 288c687a59a1e770bbb834879173e1a2ea371bce

5 files changed, 16 insertions, 16 deletions

diff --git a/base/bitfield.hh b/base/bitfield.hh
index ee5ea72cf..bdc3fb13e 100644
--- a/base/bitfield.hh
+++ b/base/bitfield.hh
@@ -26,10 +26,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __BITFIELD_HH
-#define __BITFIELD_HH
+#ifndef __BASE_BITFIELD_HH__
+#define __BASE_BITFIELD_HH__
 
-#include <inttypes.h>
+#include "sim/host.hh"
 
 /**
  * Generate a 64-bit mask of 'nbits' 1s, right justified.
@@ -66,4 +66,4 @@ sext(uint64_t val)
     return sign_bit ? (val | ~mask(N)) : val;
 }
 
-#endif
+#endif // __BASE_BITFIELD_HH__
diff --git a/base/compression/null_compression.hh b/base/compression/null_compression.hh
index 195498f1b..63364a955 100644
--- a/base/compression/null_compression.hh
+++ b/base/compression/null_compression.hh
@@ -26,16 +26,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __NULL_COMPRESSION_HH__
-#define __NULL_COMPRESSION_HH__
+#ifndef __BASE_COMPRESSION_NULL_COMPRESSION_HH__
+#define __BASE_COMPRESSION_NULL_COMPRESSION_HH__
 
 /**
  * @file
  * This file defines a doNothing compression algorithm.
  */
 
-#include <inttypes.h> // for uint8_t
 #include "base/misc.hh" // for fatal()
+#include "sim/host.hh"
 
 
 /**
@@ -73,4 +73,4 @@ class NullCompression
     }
 };
 
-#endif //__NULL_COMPRESSION_HH__
+#endif //__BASE_COMPRESSION_NULL_COMPRESSION_HH__
diff --git a/base/stats/types.hh b/base/stats/types.hh
index fbabfb118..8e45531fb 100644
--- a/base/stats/types.hh
+++ b/base/stats/types.hh
@@ -30,7 +30,7 @@
 #define __BASE_STATS_TYPES_HH__
 
 #include <vector>
-#include <inttypes.h>
+#include "sim/host.hh"
 
 namespace Stats {
 
diff --git a/kern/linux/aligned.hh b/kern/linux/aligned.hh
index 55035c6e4..042f0ad2c 100644
--- a/kern/linux/aligned.hh
+++ b/kern/linux/aligned.hh
@@ -1,7 +1,7 @@
-#ifndef __ALIGNED_HH__
-#define __ALIGNED_HH__
+#ifndef __KERN_LINUX_ALIGNED_HH__
+#define __KERN_LINUX_ALIGNED_HH__
 
-#include <stdint.h>
+#include "sim/host.hh"
 #include "targetarch/isa_traits.hh"
 
 /* GCC 3.3.X has a bug in which attributes+typedefs don't work. 3.2.X is fine
@@ -18,4 +18,4 @@ typedef Addr Addr_a __attribute__ ((aligned (8))) ;
 #define Addr_a Addr __attribute__ ((aligned (8)))
 #endif /* __GNUC__ __GNUC_MINOR__ */
 
-#endif /* __ALIGNED_H__ */
+#endif /* __KERN_LINUX_ALIGNED_HH__ */
diff --git a/kern/linux/hwrpb.hh b/kern/linux/hwrpb.hh
index 3ce03efd7..16544f196 100644
--- a/kern/linux/hwrpb.hh
+++ b/kern/linux/hwrpb.hh
@@ -1,5 +1,5 @@
-#ifndef __ALPHA_HWRPB_H__
-#define __ALPHA_HWRPB_H__
+#ifndef __KERN_LINUX_HWRPB_HH__
+#define __KERN_LINUX_HWRPB_HH__
 
 #include "kern/linux/aligned.hh"
 
@@ -15,4 +15,4 @@ namespace Linux {
         uint64_ta res1, res2;
     };
 }
-#endif /* __ALPHA_HWRPB_H */
+#endif // __KERN_LINUX_HWRPB_HH__