[rtems-libbsd commit] Directly use <sys/_types.h> provided by Newlib
Sebastian Huber
sebh at rtems.org
Mon May 30 14:18:18 UTC 2016
Module: rtems-libbsd
Branch: master
Commit: b6f6deb88310f5e69059598d54c906769a9bf12a
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=b6f6deb88310f5e69059598d54c906769a9bf12a
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Wed Apr 27 10:26:50 2016 +0200
Directly use <sys/_types.h> provided by Newlib
---
builder.py | 1 -
freebsd/include/arpa/inet.h | 2 +-
freebsd/include/err.h | 2 +-
freebsd/include/netdb.h | 2 +-
freebsd/lib/libc/include/libc_private.h | 4 +-
freebsd/lib/libkvm/kvm.h | 2 +-
freebsd/lib/libutil/libutil.h | 2 +-
freebsd/sys/netinet/in.h | 2 +-
freebsd/sys/sys/sbuf.h | 2 +-
freebsd/sys/sys/socket.h | 2 +-
freebsd/sys/sys/stdint.h | 2 +-
freebsd/sys/sys/syslog.h | 2 +-
freebsd/sys/sys/un.h | 2 +-
rtemsbsd/include/rtems/bsd/sys/_types.h | 237 ------------------------------
rtemsbsd/include/rtems/bsd/sys/resource.h | 2 +-
15 files changed, 14 insertions(+), 252 deletions(-)
diff --git a/builder.py b/builder.py
index 4a72735..4aca357 100755
--- a/builder.py
+++ b/builder.py
@@ -186,7 +186,6 @@ def fixIncludes(data):
data = re.sub('#include <sys/param.h>', '#include <rtems/bsd/sys/param.h>', data)
data = re.sub('#include <sys/resource.h>', '#include <rtems/bsd/sys/resource.h>', data)
data = re.sub('#include <sys/unistd.h>', '#include <rtems/bsd/sys/unistd.h>', data)
- data = re.sub('#include <sys/_types.h>', '#include <rtems/bsd/sys/_types.h>', data)
return data
# revert fixing the include paths inside a C or .h file
diff --git a/freebsd/include/arpa/inet.h b/freebsd/include/arpa/inet.h
index d8d8e0e..1078521 100644
--- a/freebsd/include/arpa/inet.h
+++ b/freebsd/include/arpa/inet.h
@@ -61,7 +61,7 @@
/* External definitions for functions in inet(3). */
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
/* Required for byteorder(3) functions. */
#include <machine/endian.h>
diff --git a/freebsd/include/err.h b/freebsd/include/err.h
index 81ff442..f47b003 100644
--- a/freebsd/include/err.h
+++ b/freebsd/include/err.h
@@ -41,7 +41,7 @@
* __va_list from <sys/_types.h> and use it.
*/
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
__BEGIN_DECLS
void err(int, const char *, ...) __dead2 __printf0like(2, 3);
diff --git a/freebsd/include/netdb.h b/freebsd/include/netdb.h
index baf96f6..2c2e4b3 100644
--- a/freebsd/include/netdb.h
+++ b/freebsd/include/netdb.h
@@ -58,7 +58,7 @@
#define _NETDB_H_
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
#ifndef _SIZE_T_DECLARED
typedef __size_t size_t;
diff --git a/freebsd/lib/libc/include/libc_private.h b/freebsd/lib/libc/include/libc_private.h
index 09dfacf..cebc035 100644
--- a/freebsd/lib/libc/include/libc_private.h
+++ b/freebsd/lib/libc/include/libc_private.h
@@ -34,7 +34,7 @@
#ifndef _LIBC_PRIVATE_H_
#define _LIBC_PRIVATE_H_
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
#include <sys/_pthreadtypes.h>
/*
@@ -230,7 +230,7 @@ extern void (*__cleanup)(void);
* for the wrapped "new" pad-less syscalls are here for now.
*/
extern int __getosreldate(void);
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
/* Without pad */
extern __off_t __sys_lseek(int, __off_t, int);
extern int __sys_ftruncate(int, __off_t);
diff --git a/freebsd/lib/libkvm/kvm.h b/freebsd/lib/libkvm/kvm.h
index a0c2a90..912f1d4 100644
--- a/freebsd/lib/libkvm/kvm.h
+++ b/freebsd/lib/libkvm/kvm.h
@@ -34,7 +34,7 @@
#define _KVM_H_
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
#include <nlist.h>
/* Default version symbol. */
diff --git a/freebsd/lib/libutil/libutil.h b/freebsd/lib/libutil/libutil.h
index d5808d3..60ba323 100644
--- a/freebsd/lib/libutil/libutil.h
+++ b/freebsd/lib/libutil/libutil.h
@@ -40,7 +40,7 @@
#define _LIBUTIL_H_
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
#include <sys/_stdint.h>
#ifndef _GID_T_DECLARED
diff --git a/freebsd/sys/netinet/in.h b/freebsd/sys/netinet/in.h
index 92ba45a..dc5e50e 100644
--- a/freebsd/sys/netinet/in.h
+++ b/freebsd/sys/netinet/in.h
@@ -34,7 +34,7 @@
#define _NETINET_IN_H_
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
#ifndef __rtems__
#include <machine/endian.h>
#else /* __rtems__ */
diff --git a/freebsd/sys/sys/sbuf.h b/freebsd/sys/sys/sbuf.h
index 5fa9e00..9816a4c 100644
--- a/freebsd/sys/sys/sbuf.h
+++ b/freebsd/sys/sys/sbuf.h
@@ -31,7 +31,7 @@
#ifndef _SYS_SBUF_H_
#define _SYS_SBUF_H_
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
struct sbuf;
typedef int (sbuf_drain_func)(void *, const char *, int);
diff --git a/freebsd/sys/sys/socket.h b/freebsd/sys/sys/socket.h
index ff592cc..fb2a278 100644
--- a/freebsd/sys/sys/socket.h
+++ b/freebsd/sys/sys/socket.h
@@ -34,7 +34,7 @@
#define _SYS_SOCKET_H_
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
#include <sys/_iovec.h>
#include <machine/_align.h>
diff --git a/freebsd/sys/sys/stdint.h b/freebsd/sys/sys/stdint.h
index ca3b1ee..3a9931b 100644
--- a/freebsd/sys/sys/stdint.h
+++ b/freebsd/sys/sys/stdint.h
@@ -30,7 +30,7 @@
#define _SYS_STDINT_H_
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
#ifndef __rtems__
#include <machine/_stdint.h>
diff --git a/freebsd/sys/sys/syslog.h b/freebsd/sys/sys/syslog.h
index 5407a67..6f12831 100644
--- a/freebsd/sys/sys/syslog.h
+++ b/freebsd/sys/sys/syslog.h
@@ -186,7 +186,7 @@ CODE facilitynames[] = {
* __va_list from <sys/_types.h> and use it.
*/
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
__BEGIN_DECLS
void closelog(void);
diff --git a/freebsd/sys/sys/un.h b/freebsd/sys/sys/un.h
index 9db3c6d..7837e76 100644
--- a/freebsd/sys/sys/un.h
+++ b/freebsd/sys/sys/un.h
@@ -34,7 +34,7 @@
#define _SYS_UN_H_
#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
#ifndef _SA_FAMILY_T_DECLARED
typedef __sa_family_t sa_family_t;
diff --git a/rtemsbsd/include/rtems/bsd/sys/_types.h b/rtemsbsd/include/rtems/bsd/sys/_types.h
deleted file mode 100644
index a61d47a..0000000
--- a/rtemsbsd/include/rtems/bsd/sys/_types.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike at FreeBSD.org>
- * All rights reserved.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _RTEMS_BSD_SYS__TYPES_H_
-#define _RTEMS_BSD_SYS__TYPES_H_
-
-#include <sys/cdefs.h>
-#ifndef __rtems__
-#include <machine/_types.h>
-
-/*
- * Standard type definitions.
- */
-typedef __uint32_t __blksize_t; /* file block size */
-typedef __int64_t __blkcnt_t; /* file block count */
-typedef __int32_t __clockid_t; /* clock_gettime()... */
-typedef __uint32_t __fflags_t; /* file flags */
-typedef __uint64_t __fsblkcnt_t;
-typedef __uint64_t __fsfilcnt_t;
-typedef __uint32_t __gid_t;
-typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */
-typedef __uint32_t __ino_t; /* inode number */
-typedef long __key_t; /* IPC key (for Sys V IPC) */
-typedef __int32_t __lwpid_t; /* Thread ID (a.k.a. LWP) */
-typedef __uint16_t __mode_t; /* permissions */
-typedef int __accmode_t; /* access permissions */
-typedef int __nl_item;
-typedef __uint16_t __nlink_t; /* link count */
-typedef __int64_t __off_t; /* file offset */
-typedef __int32_t __pid_t; /* process [group] */
-typedef __int64_t __rlim_t; /* resource limit - intentionally */
- /* signed, because of legacy code */
- /* that uses -1 for RLIM_INFINITY */
-typedef __uint8_t __sa_family_t;
-typedef __uint32_t __socklen_t;
-typedef long __suseconds_t; /* microseconds (signed) */
-typedef struct __timer *__timer_t; /* timer_gettime()... */
-typedef struct __mq *__mqd_t; /* mq_open()... */
-typedef __uint32_t __uid_t;
-typedef unsigned int __useconds_t; /* microseconds (unsigned) */
-typedef int __cpuwhich_t; /* which parameter for cpuset. */
-typedef int __cpulevel_t; /* level parameter for cpuset. */
-typedef int __cpusetid_t; /* cpuset identifier. */
-
-/*
- * Unusual type definitions.
- */
-/*
- * rune_t is declared to be an ``int'' instead of the more natural
- * ``unsigned long'' or ``long''. Two things are happening here. It is not
- * unsigned so that EOF (-1) can be naturally assigned to it and used. Also,
- * it looks like 10646 will be a 31 bit standard. This means that if your
- * ints cannot hold 32 bits, you will be in trouble. The reason an int was
- * chosen over a long is that the is*() and to*() routines take ints (says
- * ANSI C), but they use __ct_rune_t instead of int.
- *
- * NOTE: rune_t is not covered by ANSI nor other standards, and should not
- * be instantiated outside of lib/libc/locale. Use wchar_t. wchar_t and
- * rune_t must be the same type. Also, wint_t must be no narrower than
- * wchar_t, and should be able to hold all members of the largest
- * character set plus one extra value (WEOF), and must be at least 16 bits.
- */
-typedef int __ct_rune_t; /* arg type for ctype funcs */
-typedef __ct_rune_t __rune_t; /* rune_t (see above) */
-typedef __ct_rune_t __wchar_t; /* wchar_t (see above) */
-typedef __ct_rune_t __wint_t; /* wint_t (see above) */
-
-typedef __uint32_t __dev_t; /* device number */
-
-typedef __uint32_t __fixpt_t; /* fixed point number */
-
-/*
- * mbstate_t is an opaque object to keep conversion state during multibyte
- * stream conversions.
- */
-typedef union {
- char __mbstate8[128];
- __int64_t _mbstateL; /* for alignment */
-} __mbstate_t;
-#else /* __rtems__ */
-#include <sys/types.h>
-
-#ifdef __BSD_VISIBLE
-
-#include <machine/rtems-bsd-endian.h>
-#include <stdarg.h>
-
-#define _INT8_T_DECLARED
-#define _UINT8_T_DECLARED
-
-#define _INT16_T_DECLARED
-#define _UINT16_T_DECLARED
-
-#define _INT32_T_DECLARED
-#define _UINT32_T_DECLARED
-
-#define _INT64_T_DECLARED
-#define _UINT64_T_DECLARED
-
-#define _INTPTR_T_DECLARED
-
-#ifdef _KERNEL
-
-typedef int boolean_t;
-
-typedef clock_t __clock_t;
-
-typedef unsigned int __cpumask_t;
-
-typedef intptr_t __critical_t;
-
-typedef struct device *device_t;
-
-typedef double __double_t;
-
-typedef float __float_t;
-
-typedef intptr_t intfptr_t;
-typedef uintptr_t uintfptr_t;
-
-typedef time_t __time_t;
-
-typedef ptrdiff_t __ptrdiff_t;
-
-typedef char vm_memattr_t;
-
-#endif /* _KERNEL */
-
-typedef int accmode_t;
-#define _ACCMODE_T_DECLARED
-
-typedef uint64_t cap_rights_t;
-
-typedef int32_t __clockid_t;
-
-typedef const char *c_caddr_t;
-
-typedef uint32_t cpumask_t;
-
-typedef int cpulevel_t;
-
-typedef int cpusetid_t;
-
-typedef int cpuwhich_t;
-
-#define _DEV_T_DECLARED
-
-typedef uint32_t __fixpt_t;
-typedef __fixpt_t fixpt_t;
-
-#define _GID_T_DECLARED
-
-typedef int64_t id_t;
-
-typedef uint32_t in_addr_t;
-#define _IN_ADDR_T_DECLARED
-
-typedef uint16_t in_port_t;
-#define _IN_PORT_T_DECLARED
-
-#define _MODE_T_DECLARED
-
-typedef _off_t __off_t;
-#define _OFF_T_DECLARED
-
-#define _PID_T_DECLARED
-
-typedef int register_t;
-typedef unsigned int u_register_t;
-
-typedef intptr_t segsz_t;
-
-#undef __size_t
-typedef size_t __size_t;
-#define _SIZE_T_DECLARED
-
-#define __ssize_t ssize_t
-#define _SSIZE_T_DECLARED
-
-#define _UID_T_DECLARED
-
-#define __va_list va_list
-
-typedef uintptr_t vm_offset_t;
-typedef uint64_t vm_ooffset_t;
-typedef uintptr_t vm_paddr_t;
-typedef uint64_t vm_pindex_t;
-typedef uintptr_t vm_size_t;
-
-typedef int lwpid_t;
-#define _LWPID_T_DECLARED
-
-typedef int64_t rlim_t;
-#define _RLIM_T_DECLARED
-
-typedef uint8_t sa_family_t;
-#define _SA_FAMILY_T_DECLARED
-
-typedef size_t __socklen_t;
-typedef __socklen_t socklen_t;
-#define _SOCKLEN_T_DECLARED
-
-#define SIZE_T_MAX SIZE_MAX
-
-/* FIXME */
-#define FNONBLOCK _FNONBLOCK
-
-#endif /* __BSD_VISIBLE */
-
-#endif /* __rtems__ */
-
-#endif /* !_RTEMS_BSD_SYS__TYPES_H_ */
diff --git a/rtemsbsd/include/rtems/bsd/sys/resource.h b/rtemsbsd/include/rtems/bsd/sys/resource.h
index 09f6869..dc26c67 100644
--- a/rtemsbsd/include/rtems/bsd/sys/resource.h
+++ b/rtemsbsd/include/rtems/bsd/sys/resource.h
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#include <sys/_timeval.h>
-#include <rtems/bsd/sys/_types.h>
+#include <sys/_types.h>
/*
* Process priority specifications to get/setpriority.
More information about the vc
mailing list