Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mpl/bind merge conflicts, add build glue.



details:   https://anonhg.NetBSD.org/src/rev/60d2363c916e
branches:  trunk
changeset: 834413:60d2363c916e
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 12 13:02:42 2018 +0000

description:
merge conflicts, add build glue.

diffstat:

 external/mpl/bind/dist/unit/atf-src/atf-c++/atf-c++.3              |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/atf-c.3                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/atf_c_test.c             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/build.c                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/build.h                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/build_test.c             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/check.c                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/check.h                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/check_test.c             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr.c          |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr.h          |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr_test.c     |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/env.c             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/env.h             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/env_test.c        |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs.c              |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs.h              |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs_test.c         |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/list.c            |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/list.h            |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/list_test.c       |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/map.c             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/map.h             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/map_test.c        |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/process.c         |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/process.h         |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/process_helpers.c |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/process_test.c    |     4 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity.c          |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity.h          |    14 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity_test.c     |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/test_helpers.c    |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/test_helpers.h    |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/text.c            |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/text.h            |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/text_test.c       |     4 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/tp_main.c         |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/user.c            |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/user.h            |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/user_test.c       |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/detail/version_helper.c  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/error.c                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/error.h                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/error_fwd.h              |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/error_test.c             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/h_build.h                |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/macros.h                 |    12 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/macros_h_test.c          |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/macros_test.c            |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/tc.c                     |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/tc.h                     |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/tc_test.c                |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/tp.c                     |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/tp.h                     |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/tp_test.c                |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/unused_test.c            |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/utils.c                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/utils.h                  |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-c/utils_test.c             |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-sh/atf-check.1             |     4 +-
 external/mpl/bind/dist/unit/atf-src/atf-sh/atf-sh.1                |     2 +-
 external/mpl/bind/dist/unit/atf-src/atf-sh/atf-sh.3                |     2 +-
 external/mpl/bind/dist/unit/atf-src/bootstrap/h_tp_basic_c.c       |     2 +-
 external/mpl/bind/dist/unit/atf-src/doc/atf-test-case.4            |     4 +-
 external/mpl/bind/dist/unit/atf-src/doc/atf-test-program.1         |     4 +-
 external/mpl/bind/dist/unit/atf-src/test-programs/c_helpers.c      |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/atf-config.1             |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/atf-formats.5            |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/atf-report.1             |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/atf-run.1                |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/atf-version.1            |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/bad_metadata_helper.c    |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/expect_helpers.c         |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/process_helpers.c        |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/several_tcs_helper.c     |     2 +-
 external/mpl/bind/dist/unit/atf-src/tools/zero_tcs_helper.c        |     2 +-
 external/mpl/bind/include/config.h                                 |   678 +++
 external/mpl/bind/include/dns/code.h                               |  2213 +++++++++
 external/mpl/bind/include/dns/enumclass.h                          |    39 +
 external/mpl/bind/include/dns/enumtype.h                           |   187 +
 external/mpl/bind/include/dns/rdatastruct.h                        |  2219 ++++++++++
 external/mpl/bind/include/irs/netdb.h                              |   211 +
 external/mpl/bind/include/irs/platform.h                           |    38 +
 external/mpl/bind/include/isc/atomic.h                             |    84 +
 external/mpl/bind/include/isc/platform.h                           |   441 +
 external/mpl/bind/lib/Makefile                                     |     5 +
 external/mpl/bind/lib/Makefile.inc                                 |     4 +
 external/mpl/bind/lib/libbind9/Makefile                            |    22 +
 external/mpl/bind/lib/libbind9/shlib_version                       |     5 +
 external/mpl/bind/lib/libdns/Makefile                              |    48 +
 external/mpl/bind/lib/libdns/shlib_version                         |     5 +
 external/mpl/bind/lib/libirs/Makefile                              |    20 +
 external/mpl/bind/lib/libirs/shlib_version                         |     5 +
 external/mpl/bind/lib/libisc/Makefile                              |    48 +
 external/mpl/bind/lib/libisc/shlib_version                         |     5 +
 external/mpl/bind/lib/libisccc/Makefile                            |    19 +
 external/mpl/bind/lib/libisccc/shlib_version                       |     5 +
 external/mpl/bind/lib/libisccfg/Makefile                           |    19 +
 external/mpl/bind/lib/libisccfg/shlib_version                      |     5 +
 external/mpl/bind/lib/libns/Makefile                               |    26 +
 external/mpl/bind/lib/libns/shlib_version                          |     5 +
 101 files changed, 6451 insertions(+), 89 deletions(-)

diffs (truncated from 7244 to 300 lines):

diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c++/atf-c++.3
--- a/external/mpl/bind/dist/unit/atf-src/atf-c++/atf-c++.3     Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c++/atf-c++.3     Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: atf-c++.3,v 1.1.1.1 2018/08/12 12:08:32 christos Exp $
+.\"    $NetBSD: atf-c++.3,v 1.2 2018/08/12 13:02:42 christos Exp $
 .\"
 .\" Copyright (c) 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/atf-c.3
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/atf-c.3 Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/atf-c.3 Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: atf-c.3,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $
+.\"    $NetBSD: atf-c.3,v 1.2 2018/08/12 13:02:42 christos Exp $
 .\"
 .\" Copyright (c) 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/atf_c_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/atf_c_test.c    Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/atf_c_test.c    Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atf_c_test.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $      */
+/*     $NetBSD: atf_c_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $  */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/build.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/build.c Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/build.c Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: build.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $   */
+/*     $NetBSD: build.c,v 1.2 2018/08/12 13:02:42 christos Exp $       */
 
 /* Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/build.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/build.h Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/build.h Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: build.h,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $   */
+/*     $NetBSD: build.h,v 1.2 2018/08/12 13:02:42 christos Exp $       */
 
 /* Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/build_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/build_test.c    Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/build_test.c    Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: build_test.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $      */
+/*     $NetBSD: build_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $  */
 
 /* Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/check.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/check.c Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/check.c Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: check.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $   */
+/*     $NetBSD: check.c,v 1.2 2018/08/12 13:02:42 christos Exp $       */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/check.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/check.h Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/check.h Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: check.h,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $   */
+/*     $NetBSD: check.h,v 1.2 2018/08/12 13:02:42 christos Exp $       */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/check_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/check_test.c    Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/check_test.c    Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: check_test.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $      */
+/*     $NetBSD: check_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $  */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr.c Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr.c Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dynstr.c,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $  */
+/*     $NetBSD: dynstr.c,v 1.2 2018/08/12 13:02:42 christos Exp $      */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr.h Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr.h Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dynstr.h,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $  */
+/*     $NetBSD: dynstr.h,v 1.2 2018/08/12 13:02:42 christos Exp $      */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr_test.c    Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/dynstr_test.c    Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dynstr_test.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $     */
+/*     $NetBSD: dynstr_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $ */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/env.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/env.c    Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/env.c    Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: env.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $     */
+/*     $NetBSD: env.c,v 1.2 2018/08/12 13:02:42 christos Exp $ */
 
 /* Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/env.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/env.h    Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/env.h    Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: env.h,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $     */
+/*     $NetBSD: env.h,v 1.2 2018/08/12 13:02:42 christos Exp $ */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/env_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/env_test.c       Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/env_test.c       Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: env_test.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $        */
+/*     $NetBSD: env_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $    */
 
 /* Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs.c     Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs.c     Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fs.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $      */
+/*     $NetBSD: fs.c,v 1.2 2018/08/12 13:02:42 christos Exp $  */
 
 /* Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs.h     Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs.h     Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fs.h,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $      */
+/*     $NetBSD: fs.h,v 1.2 2018/08/12 13:02:42 christos Exp $  */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs_test.c        Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/fs_test.c        Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fs_test.c,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $ */
+/*     $NetBSD: fs_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $     */
 
 /* Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/list.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/list.c   Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/list.c   Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: list.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $    */
+/*     $NetBSD: list.c,v 1.2 2018/08/12 13:02:42 christos Exp $        */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/list.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/list.h   Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/list.h   Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: list.h,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $    */
+/*     $NetBSD: list.h,v 1.2 2018/08/12 13:02:42 christos Exp $        */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/list_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/list_test.c      Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/list_test.c      Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: list_test.c,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $       */
+/*     $NetBSD: list_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $   */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/map.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/map.c    Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/map.c    Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: map.c,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $     */
+/*     $NetBSD: map.c,v 1.2 2018/08/12 13:02:42 christos Exp $ */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/map.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/map.h    Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/map.h    Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: map.h,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $     */
+/*     $NetBSD: map.h,v 1.2 2018/08/12 13:02:42 christos Exp $ */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/map_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/map_test.c       Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/map_test.c       Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: map_test.c,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $        */
+/*     $NetBSD: map_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $    */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/process.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/process.c        Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/process.c        Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process.c,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $ */
+/*     $NetBSD: process.c,v 1.2 2018/08/12 13:02:42 christos Exp $     */
 
 /* Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/process.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/process.h        Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/process.h        Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process.h,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $ */
+/*     $NetBSD: process.h,v 1.2 2018/08/12 13:02:42 christos Exp $     */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/process_helpers.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/process_helpers.c        Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/process_helpers.c        Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process_helpers.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $ */
+/*     $NetBSD: process_helpers.c,v 1.2 2018/08/12 13:02:42 christos Exp $     */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/process_test.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/process_test.c   Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/process_test.c   Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process_test.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $    */
+/*     $NetBSD: process_test.c,v 1.2 2018/08/12 13:02:42 christos Exp $        */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -755,7 +755,7 @@
             atf_error_free(_aux_err); \
             abort(); \
         } \
-    } while (0)
+    } while (/*CONSTCOND*/0)
 
     {
         atf_process_stream_t outsb, errsb;
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity.c
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity.c Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity.c Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sanity.c,v 1.1.1.1 2018/08/12 12:08:36 christos Exp $  */
+/*     $NetBSD: sanity.c,v 1.2 2018/08/12 13:02:42 christos Exp $      */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
diff -r 2233655d353e -r 60d2363c916e external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity.h
--- a/external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity.h Sun Aug 12 13:02:41 2018 +0000
+++ b/external/mpl/bind/dist/unit/atf-src/atf-c/detail/sanity.h Sun Aug 12 13:02:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sanity.h,v 1.1.1.1 2018/08/12 12:08:37 christos Exp $  */
+/*     $NetBSD: sanity.h,v 1.2 2018/08/12 13:02:42 christos Exp $      */
 
 /* Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,34 +38,34 @@
     do { \
         if (!(x)) \
             atf_sanity_inv(__FILE__, __LINE__, #x); \
-    } while (0)
+    } while (/*CONSTCOND*/0)
 #define PRE(x) \
     do { \
         if (!(x)) \
             atf_sanity_pre(__FILE__, __LINE__, #x); \
-    } while (0)
+    } while (/*CONSTCOND*/0)
 #define POST(x) \
     do { \
         if (!(x)) \
             atf_sanity_post(__FILE__, __LINE__, #x); \
-    } while (0)
+    } while (/*CONSTCOND*/0)
 
 #else /* defined(NDEBUG) */
 



Home | Main Index | Thread Index | Old Index