Date: Wed, 25 Jul 2012 10:12:07 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r893 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files Message-ID: <201207251012.q6PAC7mf072422@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Jul 25 10:12:06 2012 New Revision: 893 Log: - switch back to getdents(2), getdirentries(2) is obsolete on NetBSD and basep is of different type on OpenBSD - link against -lkvm on OpenBSD, for consistency Modified: branches/experimental/mail/thunderbird-esr/files/patch-bug753046 branches/experimental/mail/thunderbird/files/patch-bug753046 branches/experimental/www/firefox-esr/files/patch-bug753046 branches/experimental/www/firefox-nightly/files/patch-bug753046 branches/experimental/www/firefox/files/patch-bug753046 branches/experimental/www/libxul/files/patch-bug753046 branches/experimental/www/seamonkey/files/patch-bug753046 Modified: branches/experimental/mail/thunderbird-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Tue Jul 24 19:30:45 2012 (r892) +++ branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Wed Jul 25 10:12:06 2012 (r893) @@ -260,7 +260,7 @@ index 0000000..3fc1a87 --- /dev/null +++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,108 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -318,11 +318,19 @@ + if (offset_ != size_) + return true; + ++#ifdef OS_OPENBSD + const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); ++#else ++ const int r = getdents(fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r == -1) { ++#ifdef OS_OPENBSD + DLOG(ERROR) << "getdirentries returned an error: " << errno; ++#else ++ DLOG(ERROR) << "getdents returned an error: " << errno; ++#endif + return false; + } + size_ = r; @@ -350,7 +358,9 @@ + private: + const int fd_; + char buf_[512]; -+ long *basep_; ++#ifdef OS_OPENBSD ++ off_t *basep_; ++#endif + size_t offset_, size_; + + DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); @@ -1247,7 +1257,7 @@ endif endif -+ifneq (,$(filter DragonFly FreeBSD NetBSD,$(OS_ARCH))) ++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) +endif + Modified: branches/experimental/mail/thunderbird/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-bug753046 Tue Jul 24 19:30:45 2012 (r892) +++ branches/experimental/mail/thunderbird/files/patch-bug753046 Wed Jul 25 10:12:06 2012 (r893) @@ -260,7 +260,7 @@ index 0000000..3fc1a87 --- /dev/null +++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,108 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -318,11 +318,19 @@ + if (offset_ != size_) + return true; + ++#ifdef OS_OPENBSD + const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); ++#else ++ const int r = getdents(fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r == -1) { ++#ifdef OS_OPENBSD + DLOG(ERROR) << "getdirentries returned an error: " << errno; ++#else ++ DLOG(ERROR) << "getdents returned an error: " << errno; ++#endif + return false; + } + size_ = r; @@ -350,7 +358,9 @@ + private: + const int fd_; + char buf_[512]; -+ long *basep_; ++#ifdef OS_OPENBSD ++ off_t *basep_; ++#endif + size_t offset_, size_; + + DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); @@ -1252,7 +1262,7 @@ endif endif -+ifneq (,$(filter DragonFly FreeBSD NetBSD,$(OS_ARCH))) ++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) +endif + Modified: branches/experimental/www/firefox-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-bug753046 Tue Jul 24 19:30:45 2012 (r892) +++ branches/experimental/www/firefox-esr/files/patch-bug753046 Wed Jul 25 10:12:06 2012 (r893) @@ -260,7 +260,7 @@ index 0000000..3fc1a87 --- /dev/null +++ ipc/chromium/src/base/dir_reader_bsd.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,108 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -318,11 +318,19 @@ + if (offset_ != size_) + return true; + ++#ifdef OS_OPENBSD + const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); ++#else ++ const int r = getdents(fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r == -1) { ++#ifdef OS_OPENBSD + DLOG(ERROR) << "getdirentries returned an error: " << errno; ++#else ++ DLOG(ERROR) << "getdents returned an error: " << errno; ++#endif + return false; + } + size_ = r; @@ -350,7 +358,9 @@ + private: + const int fd_; + char buf_[512]; -+ long *basep_; ++#ifdef OS_OPENBSD ++ off_t *basep_; ++#endif + size_t offset_, size_; + + DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); @@ -1247,7 +1257,7 @@ endif endif -+ifneq (,$(filter DragonFly FreeBSD NetBSD,$(OS_ARCH))) ++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) +endif + Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Jul 24 19:30:45 2012 (r892) +++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Wed Jul 25 10:12:06 2012 (r893) @@ -260,7 +260,7 @@ index 0000000..3fc1a87 --- /dev/null +++ ipc/chromium/src/base/dir_reader_bsd.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,108 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -318,11 +318,19 @@ + if (offset_ != size_) + return true; + ++#ifdef OS_OPENBSD + const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); ++#else ++ const int r = getdents(fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r == -1) { ++#ifdef OS_OPENBSD + DLOG(ERROR) << "getdirentries returned an error: " << errno; ++#else ++ DLOG(ERROR) << "getdents returned an error: " << errno; ++#endif + return false; + } + size_ = r; @@ -350,7 +358,9 @@ + private: + const int fd_; + char buf_[512]; -+ long *basep_; ++#ifdef OS_OPENBSD ++ off_t *basep_; ++#endif + size_t offset_, size_; + + DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); @@ -1223,7 +1233,7 @@ endif endif -+ifneq (,$(filter DragonFly FreeBSD NetBSD,$(OS_ARCH))) ++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) +endif + Modified: branches/experimental/www/firefox/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox/files/patch-bug753046 Tue Jul 24 19:30:45 2012 (r892) +++ branches/experimental/www/firefox/files/patch-bug753046 Wed Jul 25 10:12:06 2012 (r893) @@ -260,7 +260,7 @@ index 0000000..3fc1a87 --- /dev/null +++ ipc/chromium/src/base/dir_reader_bsd.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,108 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -318,11 +318,19 @@ + if (offset_ != size_) + return true; + ++#ifdef OS_OPENBSD + const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); ++#else ++ const int r = getdents(fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r == -1) { ++#ifdef OS_OPENBSD + DLOG(ERROR) << "getdirentries returned an error: " << errno; ++#else ++ DLOG(ERROR) << "getdents returned an error: " << errno; ++#endif + return false; + } + size_ = r; @@ -350,7 +358,9 @@ + private: + const int fd_; + char buf_[512]; -+ long *basep_; ++#ifdef OS_OPENBSD ++ off_t *basep_; ++#endif + size_t offset_, size_; + + DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); @@ -1252,7 +1262,7 @@ endif endif -+ifneq (,$(filter DragonFly FreeBSD NetBSD,$(OS_ARCH))) ++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) +endif + Modified: branches/experimental/www/libxul/files/patch-bug753046 ============================================================================== --- branches/experimental/www/libxul/files/patch-bug753046 Tue Jul 24 19:30:45 2012 (r892) +++ branches/experimental/www/libxul/files/patch-bug753046 Wed Jul 25 10:12:06 2012 (r893) @@ -260,7 +260,7 @@ index 0000000..3fc1a87 --- /dev/null +++ ipc/chromium/src/base/dir_reader_bsd.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,108 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -318,11 +318,19 @@ + if (offset_ != size_) + return true; + ++#ifdef OS_OPENBSD + const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); ++#else ++ const int r = getdents(fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r == -1) { ++#ifdef OS_OPENBSD + DLOG(ERROR) << "getdirentries returned an error: " << errno; ++#else ++ DLOG(ERROR) << "getdents returned an error: " << errno; ++#endif + return false; + } + size_ = r; @@ -350,7 +358,9 @@ + private: + const int fd_; + char buf_[512]; -+ long *basep_; ++#ifdef OS_OPENBSD ++ off_t *basep_; ++#endif + size_t offset_, size_; + + DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); @@ -1247,7 +1257,7 @@ endif endif -+ifneq (,$(filter DragonFly FreeBSD NetBSD,$(OS_ARCH))) ++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) +endif + Modified: branches/experimental/www/seamonkey/files/patch-bug753046 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bug753046 Tue Jul 24 19:30:45 2012 (r892) +++ branches/experimental/www/seamonkey/files/patch-bug753046 Wed Jul 25 10:12:06 2012 (r893) @@ -260,7 +260,7 @@ index 0000000..3fc1a87 --- /dev/null +++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,108 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -318,11 +318,19 @@ + if (offset_ != size_) + return true; + ++#ifdef OS_OPENBSD + const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); ++#else ++ const int r = getdents(fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r == -1) { ++#ifdef OS_OPENBSD + DLOG(ERROR) << "getdirentries returned an error: " << errno; ++#else ++ DLOG(ERROR) << "getdents returned an error: " << errno; ++#endif + return false; + } + size_ = r; @@ -350,7 +358,9 @@ + private: + const int fd_; + char buf_[512]; -+ long *basep_; ++#ifdef OS_OPENBSD ++ off_t *basep_; ++#endif + size_t offset_, size_; + + DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); @@ -1252,7 +1262,7 @@ endif endif -+ifneq (,$(filter DragonFly FreeBSD NetBSD,$(OS_ARCH))) ++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) +endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207251012.q6PAC7mf072422>