summaryrefslogtreecommitdiff
path: root/src/mem/ruby/common
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-05-17 14:34:52 -0700
committerNathan Binkert <nate@binkert.org>2009-05-17 14:34:52 -0700
commit8d2e51c7f52670055ffe97e221302561b87015a2 (patch)
tree792d211d603bd9155dee00861d1ce92d3ba2f09d /src/mem/ruby/common
parent709d859530325f28b904001f5a55dbdec2bad199 (diff)
downloadgem5-8d2e51c7f52670055ffe97e221302561b87015a2.tar.xz
includes: sort includes again
Diffstat (limited to 'src/mem/ruby/common')
-rw-r--r--src/mem/ruby/common/Debug.hh7
-rw-r--r--src/mem/ruby/common/Global.hh6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/mem/ruby/common/Debug.hh b/src/mem/ruby/common/Debug.hh
index 8548e9772..ad88431ef 100644
--- a/src/mem/ruby/common/Debug.hh
+++ b/src/mem/ruby/common/Debug.hh
@@ -31,13 +31,14 @@
* $Id$
*/
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef __MEM_RUBY_DEBUG_HH__
+#define __MEM_RUBY_DEBUG_HH__
#include <unistd.h>
#include <iostream>
#include "config/ruby_debug.hh"
+#include "mem/ruby/common/Global.hh"
extern std::ostream * debug_cout_ptr;
@@ -302,5 +303,5 @@ const bool ASSERT_FLAG = true;
}\
}
-#endif //DEBUG_H
+#endif // __MEM_RUBY_DEBUG_HH__
diff --git a/src/mem/ruby/common/Global.hh b/src/mem/ruby/common/Global.hh
index de2d06e0e..2f42aabcb 100644
--- a/src/mem/ruby/common/Global.hh
+++ b/src/mem/ruby/common/Global.hh
@@ -32,8 +32,8 @@
*
* */
-#ifndef GLOBAL_H
-#define GLOBAL_H
+#ifndef __MEM_RUBY_GLOBAL_HH__
+#define __MEM_RUBY_GLOBAL_HH__
#ifdef SINGLE_LEVEL_CACHE
const bool TWO_LEVEL_CACHE = false;
@@ -105,5 +105,5 @@ extern inline int max_tokens()
}
-#endif //GLOBAL_H
+#endif // __MEM_RUBY_GLOBAL_HH__