summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/locale/runetype.c2
-rw-r--r--lib/libc/locale/tolower.c4
-rw-r--r--lib/libc/locale/toupper.c4
-rw-r--r--lib/libc/stdio/local.h2
-rw-r--r--lib/libc/stdio/vasprintf.c2
-rw-r--r--lib/libc/stdio/vprintf.c2
-rw-r--r--lib/libc/stdio/vscanf.c2
-rw-r--r--lib/libc/stdio/vsnprintf.c2
-rw-r--r--lib/libc/stdio/vsprintf.c2
-rw-r--r--lib/libc/stdio/vsscanf.c2
-rw-r--r--lib/libdevinfo/devinfo.h2
-rw-r--r--lib/libkvm/kvm.h14
-rw-r--r--lib/libncurses/Makefile4
-rw-r--r--lib/libstand/stand.h4
-rw-r--r--lib/ncurses/ncurses/Makefile4
15 files changed, 26 insertions, 26 deletions
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
index a2ee9e605b59..ec1c2ec2f403 100644
--- a/lib/libc/locale/runetype.c
+++ b/lib/libc/locale/runetype.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
unsigned long
___runetype(c)
- _BSD_CT_RUNE_T_ c;
+ __ct_rune_t c;
{
int x;
_RuneRange *rr = &_CurrentRuneLocale->runetype_ext;
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
index 42392d75726e..f8caecba79ab 100644
--- a/lib/libc/locale/tolower.c
+++ b/lib/libc/locale/tolower.c
@@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <rune.h>
-_BSD_CT_RUNE_T_
+__ct_rune_t
___tolower(c)
- _BSD_CT_RUNE_T_ c;
+ __ct_rune_t c;
{
int x;
_RuneRange *rr = &_CurrentRuneLocale->maplower_ext;
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index 1871f8a0cc0b..6ce67577cde1 100644
--- a/lib/libc/locale/toupper.c
+++ b/lib/libc/locale/toupper.c
@@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <rune.h>
-_BSD_CT_RUNE_T_
+__ct_rune_t
___toupper(c)
- _BSD_CT_RUNE_T_ c;
+ __ct_rune_t c;
{
int x;
_RuneRange *rr = &_CurrentRuneLocale->mapupper_ext;
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 4d8926a766cc..bfa4aab8b4cd 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -69,7 +69,7 @@ extern int _fwalk(int (*)(FILE *));
extern int __swsetup(FILE *);
extern int __sflags(const char *, int *);
extern int __ungetc(int, FILE *);
-extern int __vfprintf(FILE *, const char *, _BSD_VA_LIST_);
+extern int __vfprintf(FILE *, const char *, __va_list);
extern int __sdidinit;
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 9d55725eae0a..9e8efcfb6ab0 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -39,7 +39,7 @@ int
vasprintf(str, fmt, ap)
char **str;
const char *fmt;
- _BSD_VA_LIST_ ap;
+ __va_list ap;
{
int ret;
FILE f;
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 1f293d6d3cbe..253870cb8bae 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
int
-vprintf(const char *__restrict fmt, _BSD_VA_LIST_ ap)
+vprintf(const char *__restrict fmt, __va_list ap)
{
return (vfprintf(stdout, fmt, ap));
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index beed0c223edc..92f55fcee382 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
int
vscanf(fmt, ap)
const char *fmt;
- _BSD_VA_LIST_ ap;
+ __va_list ap;
{
int retval;
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index eae9adc58c83..7f18c8302111 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
int
vsnprintf(char *__restrict str, size_t n, const char *__restrict fmt,
- _BSD_VA_LIST_ ap)
+ __va_list ap)
{
size_t on;
int ret;
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index b66b7c86db88..82e6297a47cb 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include "local.h"
int
-vsprintf(char *__restrict str, const char *__restrict fmt, _BSD_VA_LIST_ ap)
+vsprintf(char *__restrict str, const char *__restrict fmt, __va_list ap)
{
int ret;
FILE f;
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 58778f661ae3..81a241ca6e3d 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -62,7 +62,7 @@ int
vsscanf(str, fmt, ap)
const char *str;
const char *fmt;
- _BSD_VA_LIST_ ap;
+ __va_list ap;
{
FILE f;
struct __sFILEX ext;
diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h
index 3d978d3c7d0b..63188aa8e787 100644
--- a/lib/libdevinfo/devinfo.h
+++ b/lib/libdevinfo/devinfo.h
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-#include <machine/ansi.h>
+#include <sys/_types.h>
typedef __uintptr_t devinfo_handle_t;
#define DEVINFO_ROOT_DEVICE ((devinfo_handle_t)0)
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index 9bf4975dd931..034432ec136a 100644
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@@ -38,21 +38,21 @@
#define _KVM_H_
#include <sys/cdefs.h>
-#include <machine/ansi.h>
+#include <sys/_types.h>
#include <nlist.h>
/* Default version symbol. */
#define VRS_SYM "_version"
#define VRS_KEY "VERSION"
-#ifdef _BSD_SIZE_T_
-typedef _BSD_SIZE_T_ size_t;
-#undef _BSD_SIZE_T_
+#ifndef _SIZE_T_DECLARED
+typedef __size_t size_t;
+#define _SIZE_T_DECLARED
#endif
-#ifdef _BSD_SSIZE_T_
-typedef _BSD_SSIZE_T_ ssize_t;
-#undef _BSD_SSIZE_T_
+#ifndef _SSIZE_T_DECLARED
+typedef __ssize_t ssize_t;
+#define _SSIZE_T_DECLARED
#endif
typedef struct __kvm kvm_t;
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 92611f6c74f6..f024b9168bf3 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -386,8 +386,8 @@ curses.head: curses.h.in
-e "s%@cf_cv_type_of_bool@%${TYPE_OF_BOOL}%g" \
-e "s%@cf_cv_typeof_chtype@%${TYPEOF_CHTYPE}%g" \
-e "s%@cf_cv_widec_shift@%${WIDEC_SHIFT}%g" \
- -e "s/ _WCHAR_T/ _BSD_WCHAR_T_/g" \
- -e "s/ _WINT_T/ _BSD_WINT_T_/g" \
+ -e "s/ _WCHAR_T/ __wchar_t/g" \
+ -e "s/ _WINT_T/ __wint_t/g" \
unctrl.h: unctrl.h.in
sed <${NCURSES}/include/$@.in >$@ \
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 44656df83d34..40455fa4f51a 100644
--- a/lib/libstand/stand.h
+++ b/lib/libstand/stand.h
@@ -245,9 +245,9 @@ struct disklabel;
extern char *getdisklabel(const char *, struct disklabel *);
extern int printf(const char *fmt, ...) __printflike(1, 2);
-extern void vprintf(const char *fmt, _BSD_VA_LIST_);
+extern void vprintf(const char *fmt, __va_list);
extern int sprintf(char *buf, const char *cfmt, ...) __printflike(2, 3);
-extern void vsprintf(char *buf, const char *cfmt, _BSD_VA_LIST_);
+extern void vsprintf(char *buf, const char *cfmt, __va_list);
extern void twiddle(void);
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 92611f6c74f6..f024b9168bf3 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -386,8 +386,8 @@ curses.head: curses.h.in
-e "s%@cf_cv_type_of_bool@%${TYPE_OF_BOOL}%g" \
-e "s%@cf_cv_typeof_chtype@%${TYPEOF_CHTYPE}%g" \
-e "s%@cf_cv_widec_shift@%${WIDEC_SHIFT}%g" \
- -e "s/ _WCHAR_T/ _BSD_WCHAR_T_/g" \
- -e "s/ _WINT_T/ _BSD_WINT_T_/g" \
+ -e "s/ _WCHAR_T/ __wchar_t/g" \
+ -e "s/ _WINT_T/ __wint_t/g" \
unctrl.h: unctrl.h.in
sed <${NCURSES}/include/$@.in >$@ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 02:07:18 +0000