changeset 1465:0c52ab54a2c7

. Make equivalent changes for Bsd as per Linux.
author glewis@misty.eyesbeyond.com
date Sun, 19 Jul 2009 20:25:53 -0700
parents d5c6ebda72f3
children cd10412684b5
files make/common/Defs-bsd.gmk make/java/nio/mapfile-bsd src/solaris/classes/sun/nio/fs/BsdFileSystem.java
diffstat 3 files changed, 5 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Defs-bsd.gmk	Sun Jul 19 15:37:13 2009 -0700
+++ b/make/common/Defs-bsd.gmk	Sun Jul 19 20:25:53 2009 -0700
@@ -193,7 +193,7 @@
 CPPFLAGS_COMMON += -D_LP64=1
 endif
 
-CPPFLAGS_OPT    = 
+CPPFLAGS_OPT    = -DNDEBUG
 CPPFLAGS_DBG    = -DDEBUG
 ifneq ($(PRODUCT), java)
   CPPFLAGS_DBG    += -DLOGGING 
--- a/make/java/nio/mapfile-bsd	Sun Jul 19 15:37:13 2009 -0700
+++ b/make/java/nio/mapfile-bsd	Sun Jul 19 20:25:53 2009 -0700
@@ -111,7 +111,7 @@
 		Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
 		Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
 		Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
-		Java_sun_nio_fs_UnixNativeDispatcher_initIDs;
+		Java_sun_nio_fs_UnixNativeDispatcher_init;
 		Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
 		Java_sun_nio_fs_UnixNativeDispatcher_strerror;
 		Java_sun_nio_fs_UnixNativeDispatcher_dup;
--- a/src/solaris/classes/sun/nio/fs/BsdFileSystem.java	Sun Jul 19 15:37:13 2009 -0700
+++ b/src/solaris/classes/sun/nio/fs/BsdFileSystem.java	Sun Jul 19 20:25:53 2009 -0700
@@ -61,9 +61,9 @@
 
     @Override
     @SuppressWarnings("unchecked")
-    public FileAttributeView newFileAttributeView(String name,
-                                                  UnixPath file,
-                                                  LinkOption... options)
+    public DynamicFileAttributeView newFileAttributeView(String name,
+                                                         UnixPath file,
+                                                         LinkOption... options)
     {
         return super.newFileAttributeView(name, file, options);
     }
@@ -88,11 +88,6 @@
     void copyNonPosixAttributes(int ofd, int nfd) {
     }
 
-    @Override
-    boolean supportsSecureDirectoryStreams() {
-        return false;
-    }
-
     /**
      * Returns object to iterate over mount entries
      */