4 files changed, 18 insertions, 21 deletions
diff --git a/libjava/java/io/File.h b/libjava/java/io/File.h
index b53f6ab..f136536 100644
--- a/libjava/java/io/File.h
+++ b/libjava/java/io/File.h
@@ -25,8 +25,8 @@ class java::io::File : public ::java::lang::Object
 {
 
   jlong attr(jint);
-  jboolean _access(jint);
-  jboolean _stat(jint);
+  jboolean access(jint);
+  jboolean stat(jint);
   static void init_native();
 public:
   virtual jboolean canRead();
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 0c4fb69..ff008e0 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -1,5 +1,5 @@
 /* File.java -- Class representing a file on disk
-   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2012
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -79,11 +79,8 @@ public class File implements Serializable, Comparable<File>
   private final static int LENGTH = 1;
   
   private final native long attr (int query);
-  // On OSF1 V5.0, `stat' is a macro.  It is easiest to use the name
-  // `_stat' instead.  We do the same thing for `_access' just in
-  // case.
-  private final native boolean _access (int query);
-  private final native boolean _stat (int query);
+  private final native boolean access (int query);
+  private final native boolean stat (int query);
 
   /**
    * This is the path separator string for the current host. This field
@@ -161,7 +158,7 @@ public class File implements Serializable, Comparable<File>
   public boolean canRead()
   {
     checkRead();
-    return _access (READ);
+    return access (READ);
   }
 
   /**
@@ -181,7 +178,7 @@ public class File implements Serializable, Comparable<File>
   public boolean canWrite()
   {
     checkWrite();
-    return _access (WRITE);
+    return access (WRITE);
   }
   
   /**
@@ -202,7 +199,7 @@ public class File implements Serializable, Comparable<File>
     if (!exists())
       return false;
     checkExec();
-    return _access (EXEC);
+    return access (EXEC);
   }
 
   private native boolean performCreate() throws IOException;
@@ -288,7 +285,7 @@ public class File implements Serializable, Comparable<File>
    */
   private boolean internalExists()
   {
-    return _access (EXISTS);
+    return access (EXISTS);
   }
   
   /**
@@ -725,7 +722,7 @@ public class File implements Serializable, Comparable<File>
    */
   private boolean internalIsDirectory()
   {
-    return _stat (DIRECTORY);
+    return stat (DIRECTORY);
   }
   
   /**
@@ -757,7 +754,7 @@ public class File implements Serializable, Comparable<File>
   public boolean isFile()
   {
     checkRead();
-    return _stat (ISFILE);
+    return stat (ISFILE);
   }
 
   /**
@@ -774,7 +771,7 @@ public class File implements Serializable, Comparable<File>
   public boolean isHidden()
   {
     checkRead();
-    return _stat (ISHIDDEN);
+    return stat (ISHIDDEN);
   }
 
   /**
diff --git a/libjava/java/io/natFilePosix.cc b/libjava/java/io/natFilePosix.cc
index 5b6ec84..2c255be 100644
--- a/libjava/java/io/natFilePosix.cc
+++ b/libjava/java/io/natFilePosix.cc
@@ -1,6 +1,6 @@
 // natFile.cc - Native part of File class for POSIX.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008, 2012
    Free Software Foundation
 
    This file is part of libgcj.
@@ -38,7 +38,7 @@ details.  */
 #include <java/lang/System.h>
 
 jboolean
-java::io::File::_access (jint query)
+java::io::File::access (jint query)
 {
   char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1);
   jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
@@ -62,7 +62,7 @@ java::io::File::_access (jint query)
 }
 
 jboolean
-java::io::File::_stat (jint query)
+java::io::File::stat (jint query)
 {
   if (query == ISHIDDEN)
     return getName()->charAt(0) == '.';
diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc
index 316977b..a8e8878 100644
--- a/libjava/java/io/natFileWin32.cc
+++ b/libjava/java/io/natFileWin32.cc
@@ -1,6 +1,6 @@
 // natFileWin32.cc - Native part of File class for Win32.
 
-/* Copyright (C) 1998, 1999, 2002, 2003  Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2002, 2003, 2012 Free Software Foundation, Inc.
 
    This file is part of libgcj.
 
@@ -38,7 +38,7 @@ details.  */
 #define WIN32_EPOCH_MILLIS 11644473600000LL
 
 jboolean
-java::io::File::_access (jint query)
+java::io::File::access (jint query)
 {
   JV_TEMP_STRING_WIN32 (canon, getCanonicalPath());
   if (!canon)
@@ -63,7 +63,7 @@ java::io::File::_access (jint query)
 }
 
 jboolean
-java::io::File::_stat (jint query)
+java::io::File::stat (jint query)
 {
   JV_TEMP_STRING_WIN32 (canon, getCanonicalPath());
   if (!canon)