head	1.2;
access;
symbols
	pkgsrc-2020Q1:1.1.0.22
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.44
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.40
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.38
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.36
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.34
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.32
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.30
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.28
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.26
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.24
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.20
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.18
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.16
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.14
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.12
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.10
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.8
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.6
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.4
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.2
	pkgsrc-2015Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2020.05.17.00.47.06;	author tnn;	state dead;
branches;
next	1.1;
commitid	by06jUrXKAUzQw8C;

1.1
date	2015.02.10.14.57.35;	author tnn;	state Exp;
branches;
next	;
commitid	YVJpT8X0bY37mt9y;


desc
@@


1.2
log
@retire lang/openjdk7
@
text
@$NetBSD: patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp,v 1.1 2015/02/10 14:57:35 tnn Exp $

dirent->dd_fd is legacy, dirent->d_fd is POSIX, dirfd(dirent) is better.

--- hotspot/src/os/solaris/vm/perfMemory_solaris.cpp.orig	2015-01-26 15:21:44.000000000 +0000
+++ hotspot/src/os/solaris/vm/perfMemory_solaris.cpp
@@@@ -334,7 +334,7 @@@@ static DIR *open_directory_secure(const 
   }
 
   // Check to make sure fd and dirp are referencing the same file system object.
-  if (!is_same_fsobject(fd, dirp->dd_fd)) {
+  if (!is_same_fsobject(fd, dirfd(dirp))) {
     // The directory is not secure.
     os::close(fd);
     os::closedir(dirp);
@@@@ -366,7 +366,7 @@@@ static DIR *open_directory_secure_cwd(co
     // Directory doesn't exist or is insecure, so there is nothing to cleanup.
     return dirp;
   }
-  int fd = dirp->dd_fd;
+  int fd = dirfd(dirp);
 
   // Open a fd to the cwd and save it off.
   int result;
@


1.1
log
@Fix error observed in SmartOS bulk build.
Note: PLIST.SunOS should list only files unique to SunOS, not duplicates.
XXX why does it bundle libfreetype.so.6? looks wrong.
@
text
@d1 1
a1 1
$NetBSD$
@