--- openjdk/hotspot/src/share/vm/adlc/filebuff.hpp.ark	2007-10-23 02:00:39.000000000 +0000
+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp	2007-10-23 02:03:41.000000000 +0000
@@ -27,7 +27,7 @@
 
 // FILEBUFF.HPP - Definitions for parser file buffering routines
 
-#if _MSC_VER >= 1300  // Visual C++ 7.0 or later
+#if defined(__GNUC__) || _MSC_VER >= 1300  // Visual C++ 7.0 or later
 #include <iostream>
 #else
 #include <iostream.h>
@@ -99,8 +99,8 @@
   FileBuffRegion *copy();	            // Deep copy
   FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
 
-//  void print(std::ostream&);
-//  friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-  void print(ostream&);
-  friend ostream& operator<< (ostream&, FileBuffRegion&);
+  void print(std::ostream&);
+  friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
+//  void print(ostream&);
+//  friend ostream& operator<< (ostream&, FileBuffRegion&);
 };
--- openjdk/hotspot/src/share/vm/adlc/adlc.hpp.ark	2007-10-23 02:08:59.000000000 +0000
+++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp	2007-10-23 02:09:18.000000000 +0000
@@ -32,7 +32,7 @@
 // standard library constants
 #include "stdio.h"
 #include "stdlib.h"
-#if _MSC_VER >= 1300  // Visual C++ 7.0 or later
+#if defined(__GNUC__) || _MSC_VER >= 1300  // Visual C++ 7.0 or later
 #include <iostream>
 #else
 #include <iostream.h>
@@ -42,7 +42,7 @@
 #include "stdarg.h"
 #include <sys/types.h>
 
-#if _MSC_VER >= 1300
+#if defined(__GNUC__) || _MSC_VER >= 1300
 using namespace std;
 #endif