[src/trunk]: src * Move <wchar.h> from libcurses to include (for the missing ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src * Move <wchar.h> from libcurses to include (for the missing ...
From: kleink <kleink%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 06:59:38 +0000

details:   https://anonhg.NetBSD.org/src/rev/72ba2019dedf
branches:  trunk
changeset: 485137:72ba2019dedf
user:      kleink <kleink%NetBSD.org@localhost>
date:      Thu Apr 20 09:56:36 2000 +0000

description:
* Move <wchar.h> from libcurses to include (for the missing functionality
  is to be provided by libc).
* Define wint_t and size_t in <wchar.h> as well.

diffstat:

 include/Makefile       |   4 +-
 include/wchar.h        |  59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/libcurses/Makefile |   4 +-
 lib/libcurses/wchar.h  |  44 -------------------------------------
 4 files changed, 63 insertions(+), 48 deletions(-)

diffs (147 lines):

diff -r 0636dfcb05d1 -r 72ba2019dedf include/Makefile
--- a/include/Makefile  Thu Apr 20 09:36:11 2000 +0000
+++ b/include/Makefile  Thu Apr 20 09:56:36 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.84 2000/04/01 22:37:14 christos Exp $
+#      $NetBSD: Makefile,v 1.85 2000/04/20 09:56:36 kleink Exp $
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
 
 SRCTOP=        ..
@@ -19,7 +19,7 @@
        resolv.h rmt.h search.h setjmp.h sgtty.h signal.h stab.h stddef.h \
        stdio.h stdlib.h string.h strings.h stringlist.h struct.h sysexits.h \
        tar.h time.h ttyent.h tzfile.h ulimit.h unistd.h util.h utime.h \
-       utmp.h vis.h
+       utmp.h vis.h wchar.h
 INCS+= arpa/ftp.h arpa/inet.h arpa/nameser.h arpa/telnet.h arpa/tftp.h
 INCS+= protocols/dumprestore.h protocols/routed.h protocols/rwhod.h \
        protocols/talkd.h protocols/timed.h
diff -r 0636dfcb05d1 -r 72ba2019dedf include/wchar.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/include/wchar.h   Thu Apr 20 09:56:36 2000 +0000
@@ -0,0 +1,59 @@
+/*     $NetBSD: wchar.h,v 1.1 2000/04/20 09:56:37 kleink Exp $ */
+
+/*-
+ * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Julian Coleman.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _WCHAR_H_
+#define _WCHAR_H_
+
+#include <machine/ansi.h>
+
+#ifdef _BSD_WCHAR_T_
+typedef        _BSD_WCHAR_T_   wchar_t;
+#undef _BSD_WCHAR_T_
+#endif
+
+#ifdef _BSD_WINT_T_
+typedef        _BSD_WINT_T_    wint_t;
+#undef _BSD_WINT_T_
+#endif
+
+#ifdef _BSD_SIZE_T_
+typedef        _BSD_SIZE_T_    size_t;
+#undef _BSD_SIZE_T_
+#endif
+
+#endif /* !_WCHAR_H_ */
diff -r 0636dfcb05d1 -r 72ba2019dedf lib/libcurses/Makefile
--- a/lib/libcurses/Makefile    Thu Apr 20 09:36:11 2000 +0000
+++ b/lib/libcurses/Makefile    Thu Apr 20 09:56:36 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2000/04/18 12:23:01 blymn Exp $
+#      $NetBSD: Makefile,v 1.25 2000/04/20 09:56:38 kleink Exp $
 #      @(#)Makefile    8.2 (Berkeley) 1/2/94
 
 CPPFLAGS+=#-DTFILE=\"/dev/ttyp0\"
@@ -14,7 +14,7 @@
        scanw.c scroll.c scrollok.c setterm.c standout.c timeout.c \
        toucholap.c touchwin.c tscroll.c tstp.c tty.c unctrl.c underscore.c
 MAN=   curses.3
-INCS=  curses.h unctrl.h wchar.h
+INCS=  curses.h unctrl.h
 INCSDIR=/usr/include
 
 CPPFLAGS+=-DCM_N -DCM_GT -DCM_B -DCM_D
diff -r 0636dfcb05d1 -r 72ba2019dedf lib/libcurses/wchar.h
--- a/lib/libcurses/wchar.h     Thu Apr 20 09:36:11 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*     $NetBSD: wchar.h,v 1.2 2000/04/11 13:57:10 blymn Exp $  */
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/ansi.h>
-
-#ifdef _BSD_WCHAR_T_
-typedef        _BSD_WCHAR_T_   wchar_t;
-#undef _BSD_WCHAR_T_
-#endif

Prev by Date: [src/trunk]: src/lib/libcurses * Fix longname behaviour so it returns the las...
Next by Date: [src/trunk]: src/sys/arch/sh3/dev Fill paa_busname field in pcmciabus_attach_...
Previous by Thread: [src/trunk]: src/lib/libcurses * Fix longname behaviour so it returns the las...
Next by Thread: [src/trunk]: src/sys/arch/sh3/dev Fill paa_busname field in pcmciabus_attach_...
Indexes:

Home | Main Index | Thread Index | Old Index