Source-Changes-HG archive

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

[src/netbsd-7]: src/tools/compat Pull up following revision(s) (requested by ...



details:   https://anonhg.NetBSD.org/src/rev/a00f7a0f746e
branches:  netbsd-7
changeset: 798583:a00f7a0f746e
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 14 16:24:40 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #236):
        tools/compat/nl_types.h: revision 1.3
If the internals are not explicitly requested, use #include_next to pick
up the system version. <locale> from libc++ requires this and is used by
src/tools/elftosb2.

diffstat:

 tools/compat/nl_types.h |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (13 lines):

diff -r 9cd2b9c02446 -r a00f7a0f746e tools/compat/nl_types.h
--- a/tools/compat/nl_types.h   Fri Nov 14 15:52:27 2014 +0000
+++ b/tools/compat/nl_types.h   Fri Nov 14 16:24:40 2014 +0000
@@ -1,5 +1,7 @@
-/*     $NetBSD: nl_types.h,v 1.2 2014/02/27 01:07:52 matt Exp $        */
+/*     $NetBSD: nl_types.h,v 1.2.4.1 2014/11/14 16:24:40 martin Exp $  */
 
-#if defined(_NLS_PRIVATE) || defined(__NetBSD__)
+#if defined(_NLS_PRIVATE)
 #include "../../include/nl_types.h"
+#elif defined(__GNUC__)
+#include_next <nl_types.h>
 #endif



Home | Main Index | Thread Index | Old Index