diff options
Diffstat (limited to 'include/sys')
-rw-r--r-- | include/sys/cdefs.h | 14 | ||||
-rw-r--r-- | include/sys/mman.h | 2 | ||||
-rw-r--r-- | include/sys/msg.h | 2 | ||||
-rw-r--r-- | include/sys/resource.h | 2 | ||||
-rw-r--r-- | include/sys/select.h | 2 | ||||
-rw-r--r-- | include/sys/socket.h | 2 | ||||
-rw-r--r-- | include/sys/stat.h | 2 | ||||
-rw-r--r-- | include/sys/statvfs.h | 2 | ||||
-rw-r--r-- | include/sys/time.h | 2 | ||||
-rw-r--r-- | include/sys/times.h | 2 | ||||
-rw-r--r-- | include/sys/uio.h | 2 | ||||
-rw-r--r-- | include/sys/utsname.h | 2 | ||||
-rw-r--r-- | include/sys/wait.h | 2 |
13 files changed, 32 insertions, 6 deletions
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h index a2bdf20d93..fa93982af9 100644 --- a/include/sys/cdefs.h +++ b/include/sys/cdefs.h @@ -2,21 +2,23 @@ #include <misc/sys/cdefs.h> +#ifndef _ISOMAC /* The compiler will optimize based on the knowledge the parameter is not NULL. This will omit tests. A robust implementation cannot allow this so when compiling glibc itself we ignore this attribute. */ -#undef __nonnull -#define __nonnull(params) +# undef __nonnull +# define __nonnull(params) extern void __chk_fail (void) __attribute__ ((__noreturn__)); libc_hidden_proto (__chk_fail) rtld_hidden_proto (__chk_fail) -#if __GNUC_PREREQ (4,3) -# define __attribute_alloc_size(...) __attribute__ ((alloc_size (__VA_ARGS__))) -#else -# define __attribute_alloc_size(...) +# if __GNUC_PREREQ (4,3) +# define __attribute_alloc_size(...) __attribute__ ((alloc_size (__VA_ARGS__))) +# else +# define __attribute_alloc_size(...) +# endif #endif #endif diff --git a/include/sys/mman.h b/include/sys/mman.h index a4687b30f7..0a0e4a6533 100644 --- a/include/sys/mman.h +++ b/include/sys/mman.h @@ -1,6 +1,7 @@ #ifndef _SYS_MMAN_H #include <misc/sys/mman.h> +#ifndef _ISOMAC /* Now define the internal interfaces. */ extern void *__mmap (void *__addr, size_t __len, int __prot, int __flags, int __fd, __off_t __offset); @@ -14,5 +15,6 @@ extern void *__mremap (void *__addr, size_t __old_len, size_t __new_len, int __flags, ...); libc_hidden_proto (madvise); +#endif #endif diff --git a/include/sys/msg.h b/include/sys/msg.h index 03e17f915e..43ec5b9472 100644 --- a/include/sys/msg.h +++ b/include/sys/msg.h @@ -1,9 +1,11 @@ #ifndef _SYS_MSG_H #include <sysvipc/sys/msg.h> +#ifndef _ISOMAC extern ssize_t __libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp, int msgflg); extern int __libc_msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg); +#endif #endif diff --git a/include/sys/resource.h b/include/sys/resource.h index b4ea1ae592..c35df435a5 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -1,6 +1,7 @@ #ifndef _SYS_RESOURCE_H #include <resource/sys/resource.h> +#ifndef _ISOMAC libc_hidden_proto (getpriority) libc_hidden_proto (setpriority) libc_hidden_proto (getrlimit64) @@ -14,3 +15,4 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); #endif +#endif diff --git a/include/sys/select.h b/include/sys/select.h index 2e5901c13d..07bb49b994 100644 --- a/include/sys/select.h +++ b/include/sys/select.h @@ -1,6 +1,7 @@ #ifndef _SYS_SELECT_H #include <misc/sys/select.h> +#ifndef _ISOMAC /* Now define the internal interfaces. */ extern int __pselect (int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__exceptfds, @@ -14,3 +15,4 @@ extern int __select (int __nfds, fd_set *__restrict __readfds, libc_hidden_proto (__select) #endif +#endif diff --git a/include/sys/socket.h b/include/sys/socket.h index d45c99d1cf..2ae3428bdd 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -1,6 +1,7 @@ #ifndef _SYS_SOCKET_H #include <socket/sys/socket.h> +#ifndef _ISOMAC /* Now define the internal interfaces. */ /* Create a new socket of type TYPE in domain DOMAIN, using @@ -162,3 +163,4 @@ extern int __have_sock_cloexec; #endif #endif +#endif diff --git a/include/sys/stat.h b/include/sys/stat.h index a6cf60f401..7a65d608c5 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -1,6 +1,7 @@ #ifndef _SYS_STAT_H #include <io/sys/stat.h> +#ifndef _ISOMAC /* Now define the internal interfaces. */ extern int __stat (const char *__file, struct stat *__buf); extern int __fstat (int __fd, struct stat *__buf); @@ -55,3 +56,4 @@ libc_hidden_proto (__fxstatat64) #define __fstatat64(dfd, fname, buf, flag) \ __fxstatat64 (_STAT_VER, dfd, fname, buf, flag) #endif +#endif diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h index 74ef2db45d..fa3045386d 100644 --- a/include/sys/statvfs.h +++ b/include/sys/statvfs.h @@ -1,6 +1,7 @@ #ifndef _SYS_STATVFS_H #include <io/sys/statvfs.h> +#ifndef _ISOMAC /* Now define the internal interfaces. */ extern int __statvfs64 (const char *__file, struct statvfs64 *__buf); extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf); @@ -8,3 +9,4 @@ extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf); libc_hidden_proto (statvfs) libc_hidden_proto (fstatvfs) #endif +#endif diff --git a/include/sys/time.h b/include/sys/time.h index a5ec500cde..d5de942ed6 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -1,6 +1,7 @@ #ifndef _SYS_TIME_H #include <time/sys/time.h> +#ifndef _ISOMAC /* Now document the internal interfaces. */ extern int __gettimeofday (struct timeval *__tv, struct timezone *__tz); @@ -27,3 +28,4 @@ extern int __futimes (int fd, const struct timeval tvp[2]) attribute_hidden; #endif #endif +#endif diff --git a/include/sys/times.h b/include/sys/times.h index 6ad39fb8c5..026d140fe1 100644 --- a/include/sys/times.h +++ b/include/sys/times.h @@ -1,6 +1,8 @@ #ifndef _SYS_TIMES_H #include <posix/sys/times.h> +#ifndef _ISOMAC /* Now define the internal interfaces. */ extern clock_t __times (struct tms *__buffer); #endif +#endif diff --git a/include/sys/uio.h b/include/sys/uio.h index 1e5d64e47e..0ec9ab09a8 100644 --- a/include/sys/uio.h +++ b/include/sys/uio.h @@ -1,6 +1,7 @@ #ifndef _SYS_UIO_H #include <misc/sys/uio.h> +#ifndef _ISOMAC /* Now define the internal interfaces. */ extern ssize_t __readv (int __fd, const struct iovec *__vector, int __count); @@ -11,3 +12,4 @@ extern ssize_t __writev (int __fd, const struct iovec *__vector, extern ssize_t __libc_writev (int __fd, const struct iovec *__vector, int __count); #endif +#endif diff --git a/include/sys/utsname.h b/include/sys/utsname.h index a6b4ceb97e..66a5289638 100644 --- a/include/sys/utsname.h +++ b/include/sys/utsname.h @@ -1,8 +1,10 @@ #ifndef _SYS_UTSNAME_H #include <posix/sys/utsname.h> +#ifndef _ISOMAC extern int __uname (struct utsname *__name); libc_hidden_proto (uname) libc_hidden_proto (__uname) #endif +#endif diff --git a/include/sys/wait.h b/include/sys/wait.h index efabd0cc45..2239501614 100644 --- a/include/sys/wait.h +++ b/include/sys/wait.h @@ -1,6 +1,7 @@ #ifndef _SYS_WAIT_H #include <posix/sys/wait.h> +#ifndef _ISOMAC /* Now define the internal interfaces. */ extern __pid_t __waitpid (__pid_t __pid, int *__stat_loc, int __options); @@ -16,3 +17,4 @@ extern __pid_t __wait4 (__pid_t __pid, __WAIT_STATUS __stat_loc, int __options, struct rusage *__usage) attribute_hidden; #endif +#endif |