diff src/os/linux/vm/c1_globals_linux.hpp @ 2044:06f017f7daa7

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents f95d63e2154a
children
line wrap: on
line diff
--- a/src/os/linux/vm/c1_globals_linux.hpp	Wed Dec 29 20:06:41 2010 +0100
+++ b/src/os/linux/vm/c1_globals_linux.hpp	Fri Jan 07 18:18:08 2011 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,15 @@
  *
  */
 
+#ifndef OS_LINUX_VM_C1_GLOBALS_LINUX_HPP
+#define OS_LINUX_VM_C1_GLOBALS_LINUX_HPP
+
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
 //
 // Sets the default values for operating system dependent flags used by the
 // client compiler. (see c1_globals.hpp)
 //
+
+#endif // OS_LINUX_VM_C1_GLOBALS_LINUX_HPP