From a81b3ef330c1b36f365529cb3fe7fe275850bdf2 Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok/asmodai Date: Sat, 15 Nov 2003 19:28:42 +0000 Subject: [PATCH] Change wrapping definition from ending in DECLARED_ to DECLARED. This makes it consistent with other definitions and has as added bonus that rpm compiles again. Furthermore it keeps us synchronised to FreeBSD 5.x. --- include/netdb.h | 10 +++++----- include/runetype.h | 10 +++++----- include/search.h | 6 +++--- include/stddef.h | 18 +++++++++--------- include/stdint.h | 6 +++--- include/stdio.h | 6 +++--- include/stdlib.h | 14 +++++++------- include/string.h | 6 +++--- include/time.h | 18 +++++++++--------- include/wchar.h | 18 +++++++++--------- include/wctype.h | 6 +++--- sys/sys/socket.h | 6 +++--- sys/sys/times.h | 6 +++--- sys/sys/types.h | 26 +++++++++++++------------- 14 files changed, 78 insertions(+), 78 deletions(-) diff --git a/include/netdb.h b/include/netdb.h index 11dbe6676d..d42de731ca 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -56,7 +56,7 @@ * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ * $FreeBSD: src/include/netdb.h,v 1.14.2.5 2001/08/29 08:46:51 alfred Exp $ - * $DragonFly: src/include/netdb.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ + * $DragonFly: src/include/netdb.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _NETDB_H_ @@ -67,13 +67,13 @@ #endif #include -#ifndef _SIZE_T_DECLARED_ -#define _SIZE_T_DECLARED_ +#ifndef _SIZE_T_DECLARED +#define _SIZE_T_DECLARED typedef __size_t size_t; #endif -#ifndef _SOCKLEN_T_DECLARED_ -#define _SOCKLEN_T_DECLARED_ +#ifndef _SOCKLEN_T_DECLARED +#define _SOCKLEN_T_DECLARED typedef __socklen_t socklen_t; #endif diff --git a/include/runetype.h b/include/runetype.h index dfdf5c8738..e3eadd73b5 100644 --- a/include/runetype.h +++ b/include/runetype.h @@ -35,7 +35,7 @@ * * @(#)runetype.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/include/runetype.h,v 1.3.8.1 2002/08/08 02:42:29 imp Exp $ - * $DragonFly: src/include/Attic/runetype.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ + * $DragonFly: src/include/Attic/runetype.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _RUNETYPE_H_ @@ -46,13 +46,13 @@ #include /* for __rune_t and friends */ #endif -#ifndef _RUNE_T_DECLARED_ -#define _RUNE_T_DECLARED_ +#ifndef _RUNE_T_DECLARED +#define _RUNE_T_DECLARED typedef __rune_t rune_t; #endif #ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED_ -#define _WCHAR_T_DECLARED_ +#ifndef _WCHAR_T_DECLARED +#define _WCHAR_T_DECLARED typedef __wchar_t wchar_t; #endif #endif diff --git a/include/search.h b/include/search.h index d6ee93a0cc..f3f94cffaf 100644 --- a/include/search.h +++ b/include/search.h @@ -1,6 +1,6 @@ /* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ */ /* $FreeBSD: src/include/search.h,v 1.3.2.1 2000/08/17 07:38:34 jhb Exp $ */ -/* $DragonFly: src/include/search.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ +/* $DragonFly: src/include/search.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ /* * Written by J.T. Conklin @@ -13,8 +13,8 @@ #include #include -#ifndef _SIZE_T_DECLARED_ -#define _SIZE_T_DECLARED_ +#ifndef _SIZE_T_DECLARED +#define _SIZE_T_DECLARED typedef __size_t size_t; #endif diff --git a/include/stddef.h b/include/stddef.h index 12fee5d8ad..cd6f08ed30 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -33,7 +33,7 @@ * @(#)stddef.h 8.1 (Berkeley) 6/2/93 * * $FreeBSD: src/include/stddef.h,v 1.2.8.4 2002/08/07 15:49:32 imp Exp $ - * $DragonFly: src/include/stddef.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/stddef.h,v 1.4 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _STDDEF_H_ @@ -43,26 +43,26 @@ #include /* __rune_t and friends */ #endif -#ifndef _SIZE_T_DECLARED_ -#define _SIZE_T_DECLARED_ +#ifndef _SIZE_T_DECLARED +#define _SIZE_T_DECLARED typedef __size_t size_t; /* open group */ #endif -#ifndef _PTRDIFF_T_DECLARED_ -#define _PTRDIFF_T_DECLARED_ +#ifndef _PTRDIFF_T_DECLARED +#define _PTRDIFF_T_DECLARED typedef __ptrdiff_t ptrdiff_t; /* open group */ #endif #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -#ifndef _RUNE_T_DECLARED_ -#define _RUNE_T_DECLARED_ +#ifndef _RUNE_T_DECLARED +#define _RUNE_T_DECLARED typedef __rune_t rune_t; #endif #endif #ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED_ -#define _WCHAR_T_DECLARED_ +#ifndef _WCHAR_T_DECLARED +#define _WCHAR_T_DECLARED typedef __wchar_t wchar_t; /* open group */ #endif #endif diff --git a/include/stdint.h b/include/stdint.h index ed20f5c595..7965785061 100644 --- a/include/stdint.h +++ b/include/stdint.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/include/stdint.h,v 1.1 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/stdint.h,v 1.2 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _STDINT_H_ @@ -47,8 +47,8 @@ typedef __uintptr_t uintptr_t; typedef __intmax_t intmax_t; typedef __uintmax_t uintmax_t; -#ifndef _PTRDIFF_T_DECLARED_ -#define _PTRDIFF_T_DECLARED_ +#ifndef _PTRDIFF_T_DECLARED +#define _PTRDIFF_T_DECLARED typedef __ptrdiff_t ptrdiff_t; /* ptr1 - ptr2 */ #endif diff --git a/include/stdio.h b/include/stdio.h index 018485921b..56b370200d 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -35,7 +35,7 @@ * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 * $FreeBSD: src/include/stdio.h,v 1.24.2.5 2002/11/09 08:07:20 imp Exp $ - * $DragonFly: src/include/stdio.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ + * $DragonFly: src/include/stdio.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _STDIO_H_ @@ -49,8 +49,8 @@ #include #endif -#ifndef _SIZE_T_DECLARED_ -#define _SIZE_T_DECLARED_ +#ifndef _SIZE_T_DECLARED +#define _SIZE_T_DECLARED typedef __size_t size_t; #endif diff --git a/include/stdlib.h b/include/stdlib.h index ce92d441d4..ffe2889265 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -32,7 +32,7 @@ * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 * $FreeBSD: src/include/stdlib.h,v 1.16.2.5 2002/12/13 01:34:00 tjr Exp $ - * $DragonFly: src/include/stdlib.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ + * $DragonFly: src/include/stdlib.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _STDLIB_H_ @@ -45,21 +45,21 @@ #endif #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -#ifndef _RUNE_T_DECLARED_ -#define _RUNE_T_DECLARED_ +#ifndef _RUNE_T_DECLARED +#define _RUNE_T_DECLARED typedef __rune_t rune_t; #endif #endif #ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED_ -#define _WCHAR_T_DECLARED_ +#ifndef _WCHAR_T_DECLARED +#define _WCHAR_T_DECLARED typedef __wchar_t wchar_t; #endif #endif -#ifndef _SIZE_T_DECLARED_ -#define _SIZE_T_DECLARED_ +#ifndef _SIZE_T_DECLARED +#define _SIZE_T_DECLARED typedef __size_t size_t; #endif diff --git a/include/string.h b/include/string.h index f144690edf..b36a20aace 100644 --- a/include/string.h +++ b/include/string.h @@ -32,7 +32,7 @@ * * @(#)string.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/include/string.h,v 1.6.2.3 2001/12/25 00:36:57 ache Exp $ - * $DragonFly: src/include/string.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ + * $DragonFly: src/include/string.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _STRING_H_ @@ -42,8 +42,8 @@ #include #endif -#ifndef _SIZE_T_DECLARED_ -#define _SIZE_T_DECLARED_ +#ifndef _SIZE_T_DECLARED +#define _SIZE_T_DECLARED typedef __size_t size_t; /* open group */ #endif diff --git a/include/time.h b/include/time.h index 4d6ec70b23..5d81ea8000 100644 --- a/include/time.h +++ b/include/time.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)time.h 8.3 (Berkeley) 1/21/94 - * $DragonFly: src/include/time.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ + * $DragonFly: src/include/time.h,v 1.4 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _TIME_H_ @@ -63,13 +63,13 @@ #define NULL 0 #endif -#ifndef _CLOCK_T_DECLARED_ -#define _CLOCK_T_DECLARED_ +#ifndef _CLOCK_T_DECLARED +#define _CLOCK_T_DECLARED typedef __clock_t clock_t; #endif -#ifndef _TIME_T_DECLARED_ -#define _TIME_T_DECLARED_ +#ifndef _TIME_T_DECLARED +#define _TIME_T_DECLARED typedef __time_t time_t; #endif @@ -80,13 +80,13 @@ typedef __time_t time_t; /* * New in POSIX 1003.1b-1993. */ -#ifndef _CLOCKID_T_DECLARED_ -#define _CLOCKID_T_DECLARED_ +#ifndef _CLOCKID_T_DECLARED +#define _CLOCKID_T_DECLARED typedef __clockid_t clockid_t; #endif -#ifndef _TIMER_T_DECLARED_ -#define _TIMER_T_DECLARED_ +#ifndef _TIMER_T_DECLARED +#define _TIMER_T_DECLARED typedef __timer_t timer_t; #endif diff --git a/include/wchar.h b/include/wchar.h index af493bab2b..05d5e1e808 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/wchar.h,v 1.3.2.2 2002/08/08 02:42:29 imp Exp $ - * $DragonFly: src/include/wchar.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ + * $DragonFly: src/include/wchar.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ /*- @@ -78,24 +78,24 @@ #endif #ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED_ -#define _WCHAR_T_DECLARED_ +#ifndef _WCHAR_T_DECLARED +#define _WCHAR_T_DECLARED typedef __wchar_t wchar_t; #endif #endif -#ifndef _MBSTATE_T_DECLARED_ -#define _MBSTATE_T_DECLARED_ +#ifndef _MBSTATE_T_DECLARED +#define _MBSTATE_T_DECLARED typedef __mbstate_t mbstate_t; #endif -#ifndef _WINT_T_DECLARED_ -#define _WINT_T_DECLARED_ +#ifndef _WINT_T_DECLARED +#define _WINT_T_DECLARED typedef __wint_t wint_t; #endif -#ifndef _SIZE_T_DECLARED_ -#define _SIZE_T_DECLARED_ +#ifndef _SIZE_T_DECLARED +#define _SIZE_T_DECLARED typedef __size_t size_t; /* open group */ #endif diff --git a/include/wctype.h b/include/wctype.h index dc47384aae..f55ed1d029 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -26,7 +26,7 @@ * citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp * $NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $ * $FreeBSD: src/include/wctype.h,v 1.3.2.1 2001/07/11 23:48:38 obrien Exp $ - * $DragonFly: src/include/wctype.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ + * $DragonFly: src/include/wctype.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ #if 0 @@ -39,8 +39,8 @@ #include #endif -#ifndef _WINT_T_DECLARED_ -#define _WINT_T_DECLARED_ +#ifndef _WINT_T_DECLARED +#define _WINT_T_DECLARED typedef __wint_t wint_t; #endif diff --git a/sys/sys/socket.h b/sys/sys/socket.h index a67334114b..761344fe07 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -32,7 +32,7 @@ * * @(#)socket.h 8.4 (Berkeley) 2/21/94 * $FreeBSD: src/sys/sys/socket.h,v 1.39.2.7 2001/07/03 11:02:01 ume Exp $ - * $DragonFly: src/sys/sys/socket.h,v 1.7 2003/11/09 02:22:37 dillon Exp $ + * $DragonFly: src/sys/sys/socket.h,v 1.8 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _SYS_SOCKET_H_ @@ -55,8 +55,8 @@ */ typedef __uint8_t sa_family_t; -#ifndef _SOCKLEN_T_DECLARED_ -#define _SOCKLEN_T_DECLARED_ +#ifndef _SOCKLEN_T_DECLARED +#define _SOCKLEN_T_DECLARED typedef __socklen_t socklen_t; #endif diff --git a/sys/sys/times.h b/sys/sys/times.h index f0f30e7263..309a73628e 100644 --- a/sys/sys/times.h +++ b/sys/sys/times.h @@ -37,7 +37,7 @@ * * @(#)times.h 8.4 (Berkeley) 1/21/94 * $FreeBSD: src/sys/sys/times.h,v 1.6 1999/12/29 04:24:48 peter Exp $ - * $DragonFly: src/sys/sys/times.h,v 1.4 2003/11/09 02:22:37 dillon Exp $ + * $DragonFly: src/sys/sys/times.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _SYS_TIMES_H_ @@ -47,8 +47,8 @@ #include #endif -#ifndef _CLOCK_T_DECLARED_ -#define _CLOCK_T_DECLARED_ +#ifndef _CLOCK_T_DECLARED +#define _CLOCK_T_DECLARED typedef __clock_t clock_t; #endif diff --git a/sys/sys/types.h b/sys/sys/types.h index 3ee85b80f8..c4120ca73e 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -37,7 +37,7 @@ * * @(#)types.h 8.6 (Berkeley) 2/19/95 * $FreeBSD: src/sys/sys/types.h,v 1.40.2.2 2001/04/21 14:53:06 ume Exp $ - * $DragonFly: src/sys/sys/types.h,v 1.5 2003/11/09 02:22:37 dillon Exp $ + * $DragonFly: src/sys/sys/types.h,v 1.6 2003/11/15 19:28:42 asmodai Exp $ */ #ifndef _SYS_TYPES_H_ @@ -121,33 +121,33 @@ typedef u_int32_t dev_t; /* device number */ #endif /* !_KERNEL */ -#ifndef _CLOCK_T_DECLARED_ -#define _CLOCK_T_DECLARED_ +#ifndef _CLOCK_T_DECLARED +#define _CLOCK_T_DECLARED typedef __clock_t clock_t; #endif -#ifndef _CLOCKID_T_DECLARED_ -#define _CLOCKID_T_DECLARED_ +#ifndef _CLOCKID_T_DECLARED +#define _CLOCKID_T_DECLARED typedef __clockid_t clockid_t; #endif -#ifndef _SIZE_T_DECLARED_ -#define _SIZE_T_DECLARED_ +#ifndef _SIZE_T_DECLARED +#define _SIZE_T_DECLARED typedef __size_t size_t; #endif -#ifndef _SSIZE_T_DECLARED_ -#define _SSIZE_T_DECLARED_ +#ifndef _SSIZE_T_DECLARED +#define _SSIZE_T_DECLARED typedef __ssize_t ssize_t; #endif -#ifndef _TIME_T_DECLARED_ -#define _TIME_T_DECLARED_ +#ifndef _TIME_T_DECLARED +#define _TIME_T_DECLARED typedef __time_t time_t; #endif -#ifndef _TIMER_T_DECLARED_ -#define _TIMER_T_DECLARED_ +#ifndef _TIMER_T_DECLARED +#define _TIMER_T_DECLARED typedef __timer_t timer_t; #endif -- 2.41.0