From 8fc78b5a68bf96e3b52c2155e8a089e746a10579 Mon Sep 17 00:00:00 2001 From: semarie Date: Sat, 6 Aug 2022 13:31:13 +0000 Subject: [PATCH] remove swblk_t type from sys/types.h - it is currently unused (except in some regress) - it is non-standard - it shouldn't have been visible in first place ok jca@ mpi@ todd@ deraadt@ --- regress/misc/c++abi/nm1.C | 3 +-- regress/misc/c++abi/nm1.ref | 1 - sys/sys/_types.h | 3 +-- sys/sys/types.h | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/regress/misc/c++abi/nm1.C b/regress/misc/c++abi/nm1.C index 698c0bf1819..b20b3a8bfbe 100644 --- a/regress/misc/c++abi/nm1.C +++ b/regress/misc/c++abi/nm1.C @@ -1,4 +1,4 @@ -/* $OpenBSD: nm1.C,v 1.2 2017/02/07 12:57:12 bluhm Exp $ */ +/* $OpenBSD: nm1.C,v 1.3 2022/08/06 13:31:13 semarie Exp $ */ #include #include #include @@ -23,7 +23,6 @@ D(sa_family_t) D(segsz_t) D(socklen_t) D(suseconds_t) -D(swblk_t) D(uid_t) D(uint64_t) D(uint32_t) diff --git a/regress/misc/c++abi/nm1.ref b/regress/misc/c++abi/nm1.ref index fa25ac73d38..82ca8fcd13b 100644 --- a/regress/misc/c++abi/nm1.ref +++ b/regress/misc/c++abi/nm1.ref @@ -18,7 +18,6 @@ sa_family_t(unsigned char) segsz_t(int) socklen_t(unsigned int) suseconds_t(long) -swblk_t(int) uid_t(unsigned int) uint64_t(unsigned long long) uint32_t(unsigned int) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index e05867429cd..33fa2d88646 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _types.h,v 1.9 2014/08/22 23:05:15 krw Exp $ */ +/* $OpenBSD: _types.h,v 1.10 2022/08/06 13:31:13 semarie Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -60,7 +60,6 @@ typedef __uint8_t __sa_family_t; /* sockaddr address family type */ typedef __int32_t __segsz_t; /* segment size */ typedef __uint32_t __socklen_t; /* length type for network syscalls */ typedef long __suseconds_t; /* microseconds (signed) */ -typedef __int32_t __swblk_t; /* swap offset */ typedef __int64_t __time_t; /* epoch time */ typedef __int32_t __timer_t; /* POSIX timer identifiers */ typedef __uint32_t __uid_t; /* user id */ diff --git a/sys/sys/types.h b/sys/sys/types.h index dbbde5872e7..2207da9994f 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.48 2019/02/09 04:54:11 guenther Exp $ */ +/* $OpenBSD: types.h,v 1.49 2022/08/06 13:31:13 semarie Exp $ */ /* $NetBSD: types.h,v 1.29 1996/11/15 22:48:25 jtc Exp $ */ /*- @@ -144,7 +144,6 @@ typedef __mode_t mode_t; /* permissions */ typedef __nlink_t nlink_t; /* link count */ typedef __rlim_t rlim_t; /* resource limit */ typedef __segsz_t segsz_t; /* segment size */ -typedef __swblk_t swblk_t; /* swap offset */ typedef __uid_t uid_t; /* user id */ typedef __useconds_t useconds_t; /* microseconds */ typedef __suseconds_t suseconds_t; /* microseconds (signed) */ -- 2.20.1