diff src/share/vm/utilities/sizes.cpp @ 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/share/vm/utilities/sizes.cpp	Wed Dec 29 20:06:41 2010 +0100
+++ b/src/share/vm/utilities/sizes.cpp	Fri Jan 07 18:18:08 2011 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 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,5 +22,6 @@
  *
  */
 
-# include "incls/_precompiled.incl"
-# include "incls/_sizes.cpp.incl"
+#include "precompiled.hpp"
+#include "utilities/sizes.hpp"
+