[rtems-libbsd commit] libc namespace.h: Use RTEMS specific versions

Joel Sherrill joel at rtems.org
Fri Sep 7 17:46:51 UTC 2012


Module:    rtems-libbsd
Branch:    master
Commit:    f25ce7ab7d5d57b88739f5b043a4132f97cac2d6
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=f25ce7ab7d5d57b88739f5b043a4132f97cac2d6

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Fri Sep  7 12:43:13 2012 -0500

libc namespace.h: Use RTEMS specific versions

FreeBSD adds an _ prefix to a number of libc symbols so they
can switch from threaded to non-threaded libraries. We don't
have that distinction and don't need this.

Unfortunately, they also explicitly use the _ prefixed names
of some methods. So we fix this in our version of namespace.h

---

 freebsd-userspace/lib/libc/include/namespace.h    |  263 ---------------------
 freebsd-userspace/lib/libc/include/un-namespace.h |  253 --------------------
 freebsd-userspace/rtems/include/namespace.h       |   58 +++++
 freebsd-userspace/rtems/include/un-namespace.h    |   32 +++
 4 files changed, 90 insertions(+), 516 deletions(-)

diff --git a/freebsd-userspace/lib/libc/include/namespace.h b/freebsd-userspace/lib/libc/include/namespace.h
deleted file mode 100644
index a65b929..0000000
--- a/freebsd-userspace/lib/libc/include/namespace.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen 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 REGENTS 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 _NAMESPACE_H_
-#define _NAMESPACE_H_
-
-/*
- * Adjust names so that headers declare "hidden" names.
- *
- * README: When modifying this file don't forget to make the appropriate
- *         changes in un-namespace.h!!!
- */
-
-/*
- * ISO C (C90) section.  Most names in libc aren't in ISO C, so they
- * should be here.  Most aren't here...
- */
-#define		err				_err
-#define		warn				_warn
-#define		nsdispatch			_nsdispatch
-
-/*
- * Prototypes for syscalls/functions that need to be overridden
- * in libc_r/libpthread.
- */
-#define		accept				_accept
-#define		__acl_aclcheck_fd		___acl_aclcheck_fd
-#define		__acl_delete_fd			___acl_delete_fd
-#define		__acl_get_fd			___acl_get_fd
-#define		__acl_set_fd			___acl_set_fd
-#define		bind				_bind
-#define		__cap_get_fd			___cap_get_fd
-#define		__cap_set_fd			___cap_set_fd
-#define		close				_close
-#define		connect				_connect
-#define		dup				_dup
-#define		dup2				_dup2
-#define		execve				_execve
-#define		fcntl				_fcntl
-/*#define		flock				_flock */
-#define		flockfile			_flockfile
-#define		fpathconf			_fpathconf
-#define		fstat				_fstat
-#define		fstatfs				_fstatfs
-#define		fsync				_fsync
-#define		funlockfile			_funlockfile
-#define		getdirentries			_getdirentries
-#define		getlogin			_getlogin
-#define		getpeername			_getpeername
-#define		getprogname			_getprogname
-#define		getsockname			_getsockname
-#define		getsockopt			_getsockopt
-#define		ioctl				_ioctl
-/* #define		kevent				_kevent */
-#define		listen				_listen
-#define		nanosleep			_nanosleep
-#define		open				_open
-#define		poll				_poll
-#define		pthread_atfork			_pthread_atfork
-#define		pthread_attr_destroy		_pthread_attr_destroy
-#define		pthread_attr_get_np		_pthread_attr_get_np
-#define		pthread_attr_getaffinity_np	_pthread_attr_getaffinity_np
-#define		pthread_attr_getdetachstate	_pthread_attr_getdetachstate
-#define		pthread_attr_getguardsize	_pthread_attr_getguardsize
-#define		pthread_attr_getinheritsched	_pthread_attr_getinheritsched
-#define		pthread_attr_getschedparam	_pthread_attr_getschedparam
-#define		pthread_attr_getschedpolicy	_pthread_attr_getschedpolicy
-#define		pthread_attr_getscope		_pthread_attr_getscope
-#define		pthread_attr_getstack		_pthread_attr_getstack
-#define		pthread_attr_getstackaddr	_pthread_attr_getstackaddr
-#define		pthread_attr_getstacksize	_pthread_attr_getstacksize
-#define		pthread_attr_init		_pthread_attr_init
-#define		pthread_attr_setaffinity_np	_pthread_attr_setaffinity_np
-#define		pthread_attr_setcreatesuspend_np _pthread_attr_setcreatesuspend_np
-#define		pthread_attr_setdetachstate	_pthread_attr_setdetachstate
-#define		pthread_attr_setguardsize	_pthread_attr_setguardsize
-#define		pthread_attr_setinheritsched	_pthread_attr_setinheritsched
-#define		pthread_attr_setschedparam	_pthread_attr_setschedparam
-#define		pthread_attr_setschedpolicy	_pthread_attr_setschedpolicy
-#define		pthread_attr_setscope		_pthread_attr_setscope
-#define		pthread_attr_setstack		_pthread_attr_setstack
-#define		pthread_attr_setstackaddr	_pthread_attr_setstackaddr
-#define		pthread_attr_setstacksize	_pthread_attr_setstacksize
-#define		pthread_barrier_destroy		_pthread_barrier_destroy
-#define		pthread_barrier_init		_pthread_barrier_init
-#define		pthread_barrier_wait		_pthread_barrier_wait
-#define		pthread_barrierattr_destroy	_pthread_barrierattr_destroy
-#define		pthread_barrierattr_getpshared	_pthread_barrierattr_getpshared
-#define		pthread_barrierattr_init	_pthread_barrierattr_init
-#define		pthread_barrierattr_setpshared	_pthread_barrierattr_setpshared
-#define		pthread_cancel			_pthread_cancel
-#define		pthread_cond_broadcast		_pthread_cond_broadcast
-#define		pthread_cond_destroy		_pthread_cond_destroy
-#define		pthread_cond_init		_pthread_cond_init
-#define		pthread_cond_signal		_pthread_cond_signal
-#define		pthread_cond_timedwait		_pthread_cond_timedwait
-#define		pthread_cond_wait		_pthread_cond_wait
-#define		pthread_condattr_destroy	_pthread_condattr_destroy
-#define		pthread_condattr_getclock	_pthread_condattr_getclock
-#define		pthread_condattr_getpshared	_pthread_condattr_getpshared
-#define		pthread_condattr_init		_pthread_condattr_init
-#define		pthread_condattr_setclock	_pthread_condattr_setclock
-#define		pthread_condattr_setpshared	_pthread_condattr_setpshared
-#define		pthread_create			_pthread_create
-#define		pthread_detach			_pthread_detach
-#define		pthread_equal			_pthread_equal
-#define		pthread_exit			_pthread_exit
-#define		pthread_getaffinity_np		_pthread_getaffinity_np
-#define		pthread_getconcurrency		_pthread_getconcurrency
-#define		pthread_getcpuclockid		_pthread_getcpuclockid
-#define		pthread_getprio			_pthread_getprio
-#define		pthread_getschedparam		_pthread_getschedparam
-#define		pthread_getspecific		_pthread_getspecific
-#define		pthread_join			_pthread_join
-#define		pthread_key_create		_pthread_key_create
-#define		pthread_key_delete		_pthread_key_delete
-#define		pthread_kill			_pthread_kill
-#define		pthread_main_np			_pthread_main_np
-#define		pthread_multi_np		_pthread_multi_np
-#define		pthread_mutex_destroy		_pthread_mutex_destroy
-#define		pthread_mutex_getprioceiling	_pthread_mutex_getprioceiling
-#define		pthread_mutex_init		_pthread_mutex_init
-#define		pthread_mutex_isowned_np	_pthread_mutex_isowned_np
-#define		pthread_mutex_lock		_pthread_mutex_lock
-#define		pthread_mutex_setprioceiling	_pthread_mutex_setprioceiling
-#define		pthread_mutex_timedlock		_pthread_mutex_timedlock
-#define		pthread_mutex_trylock		_pthread_mutex_trylock
-#define		pthread_mutex_unlock		_pthread_mutex_unlock
-#define		pthread_mutexattr_destroy	_pthread_mutexattr_destroy
-#define		pthread_mutexattr_getkind_np	_pthread_mutexattr_getkind_np
-#define		pthread_mutexattr_getprioceiling _pthread_mutexattr_getprioceiling
-#define		pthread_mutexattr_getprotocol	_pthread_mutexattr_getprotocol
-#define		pthread_mutexattr_getpshared	_pthread_mutexattr_getpshared
-#define		pthread_mutexattr_gettype	_pthread_mutexattr_gettype
-#define		pthread_mutexattr_init		_pthread_mutexattr_init
-#define		pthread_mutexattr_setkind_np	_pthread_mutexattr_setkind_np
-#define		pthread_mutexattr_setprioceiling _pthread_mutexattr_setprioceiling
-#define		pthread_mutexattr_setprotocol	_pthread_mutexattr_setprotocol
-#define		pthread_mutexattr_setpshared	_pthread_mutexattr_setpshared
-#define		pthread_mutexattr_settype	_pthread_mutexattr_settype
-#define		pthread_once			_pthread_once
-#define		pthread_resume_all_np		_pthread_resume_all_np
-#define		pthread_resume_np		_pthread_resume_np
-#define		pthread_rwlock_destroy		_pthread_rwlock_destroy
-#define		pthread_rwlock_init		_pthread_rwlock_init
-#define		pthread_rwlock_rdlock		_pthread_rwlock_rdlock
-#define		pthread_rwlock_timedrdlock	_pthread_rwlock_timedrdlock
-#define		pthread_rwlock_timedwrlock	_pthread_rwlock_timedwrlock
-#define		pthread_rwlock_tryrdlock	_pthread_rwlock_tryrdlock
-#define		pthread_rwlock_trywrlock	_pthread_rwlock_trywrlock
-#define		pthread_rwlock_unlock		_pthread_rwlock_unlock
-#define		pthread_rwlock_wrlock		_pthread_rwlock_wrlock
-#define		pthread_rwlockattr_destroy	_pthread_rwlockattr_destroy
-#define		pthread_rwlockattr_getpshared	_pthread_rwlockattr_getpshared
-#define		pthread_rwlockattr_init		_pthread_rwlockattr_init
-#define		pthread_rwlockattr_setpshared	_pthread_rwlockattr_setpshared
-#define		pthread_self			_pthread_self
-#define		pthread_set_name_np		_pthread_set_name_np
-#define		pthread_setaffinity_np		_pthread_setaffinity_np
-#define		pthread_setcancelstate		_pthread_setcancelstate
-#define		pthread_setcanceltype		_pthread_setcanceltype
-#define		pthread_setconcurrency		_pthread_setconcurrency
-#define		pthread_setprio			_pthread_setprio
-#define		pthread_setschedparam		_pthread_setschedparam
-#define		pthread_setspecific		_pthread_setspecific
-#define		pthread_sigmask			_pthread_sigmask
-#define		pthread_single_np		_pthread_single_np
-#define		pthread_spin_destroy		_pthread_spin_destroy
-#define		pthread_spin_init		_pthread_spin_init
-#define		pthread_spin_lock		_pthread_spin_lock
-#define		pthread_spin_trylock		_pthread_spin_trylock
-#define		pthread_spin_unlock		_pthread_spin_unlock
-#define		pthread_suspend_all_np		_pthread_suspend_all_np
-#define		pthread_suspend_np		_pthread_suspend_np
-#define		pthread_switch_add_np		_pthread_switch_add_np
-#define		pthread_switch_delete_np	_pthread_switch_delete_np
-#define		pthread_testcancel		_pthread_testcancel
-#define		pthread_timedjoin_np		_pthread_timedjoin_np
-#define		pthread_yield			_pthread_yield
-#define		read				_read
-#define		readv				_readv
-#define		recvfrom			_recvfrom
-#define		recvmsg				_recvmsg
-#define		select				_select
-#define		sem_close			_sem_close
-#define		sem_destroy			_sem_destroy
-#define		sem_getvalue			_sem_getvalue
-#define		sem_init			_sem_init
-#define		sem_open			_sem_open
-#define		sem_post			_sem_post
-#define		sem_timedwait			_sem_timedwait
-#define		sem_trywait			_sem_trywait
-#define		sem_unlink			_sem_unlink
-#define		sem_wait			_sem_wait
-#define		sendmsg				_sendmsg
-#define		sendto				_sendto
-#define		setsockopt			_setsockopt
-/*#define		sigaction			_sigaction*/
-#define		sigprocmask			_sigprocmask
-#define		sigsuspend			_sigsuspend
-#define		socket				_socket
-#define		socketpair			_socketpair
-#define		usleep				_usleep
-#define		wait4				_wait4
-#define		waitpid				_waitpid
-#define		write				_write
-#define		writev				_writev
-
-
-/*
- * Other hidden syscalls/functions that libc_r needs to override
- * but are not used internally by libc.
- *
- * XXX - When modifying libc to use one of the following, remove
- * the prototype from below and place it in the list above.
- */
-#if 0
-#define		creat				_creat
-#define		fchflags			_fchflags
-#define		fchmod				_fchmod
-#define		ftrylockfile			_ftrylockfile
-#define		msync				_msync
-#define		nfssvc				_nfssvc
-#define		pause				_pause
-#define		sched_yield			_sched_yield
-#define		sendfile			_sendfile
-#define		shutdown			_shutdown
-#define		sigaltstack			_sigaltstack
-#define		sigpending			_sigpending
-#define		sigreturn			_sigreturn
-#define		sigsetmask			_sigsetmask
-#define		sleep				_sleep
-#define		system				_system
-#define		tcdrain				_tcdrain
-#define		wait				_wait
-#endif
-
-#endif /* _NAMESPACE_H_ */
diff --git a/freebsd-userspace/lib/libc/include/un-namespace.h b/freebsd-userspace/lib/libc/include/un-namespace.h
deleted file mode 100644
index 6b7f49a..0000000
--- a/freebsd-userspace/lib/libc/include/un-namespace.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen 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 REGENTS 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 _UN_NAMESPACE_H_
-#define _UN_NAMESPACE_H_
-
-#undef		accept
-#undef		__acl_aclcheck_fd
-#undef		__acl_delete_fd
-#undef		__acl_get_fd
-#undef		__acl_set_fd
-#undef		bind
-#undef		__cap_get_fd
-#undef		__cap_set_fd
-#undef		close
-#undef		connect
-#undef		dup
-#undef		dup2
-#undef		execve
-#undef		fcntl
-#undef		flock
-#undef		flockfile
-#undef		fpathconf
-#undef		fstat
-#undef		fstatfs
-#undef		fsync
-#undef		funlockfile
-#undef		getdirentries
-#undef		getlogin
-#undef		getpeername
-#undef		getprogname
-#undef		getsockname
-#undef		getsockopt
-#undef		ioctl
-#undef		kevent
-#undef		listen
-#undef		nanosleep
-#undef		open
-#undef		poll
-#undef		pthread_atfork
-#undef		pthread_attr_destroy
-#undef		pthread_attr_get_np
-#undef		pthread_attr_getaffinity_np
-#undef		pthread_attr_getdetachstate
-#undef		pthread_attr_getguardsize
-#undef		pthread_attr_getinheritsched
-#undef		pthread_attr_getschedparam
-#undef		pthread_attr_getschedpolicy
-#undef		pthread_attr_getscope
-#undef		pthread_attr_getstack
-#undef		pthread_attr_getstackaddr
-#undef		pthread_attr_getstacksize
-#undef		pthread_attr_init
-#undef		pthread_attr_setaffinity_np
-#undef		pthread_attr_setcreatesuspend_np
-#undef		pthread_attr_setdetachstate
-#undef		pthread_attr_setguardsize
-#undef		pthread_attr_setinheritsched
-#undef		pthread_attr_setschedparam
-#undef		pthread_attr_setschedpolicy
-#undef		pthread_attr_setscope
-#undef		pthread_attr_setstack
-#undef		pthread_attr_setstackaddr
-#undef		pthread_attr_setstacksize
-#undef		pthread_barrier_destroy
-#undef		pthread_barrier_init
-#undef		pthread_barrier_wait
-#undef		pthread_barrierattr_destroy
-#undef		pthread_barrierattr_getpshared
-#undef		pthread_barrierattr_init
-#undef		pthread_barrierattr_setpshared
-#undef		pthread_cancel
-#undef		pthread_cond_broadcast
-#undef		pthread_cond_destroy
-#undef		pthread_cond_init
-#undef		pthread_cond_signal
-#undef		pthread_cond_timedwait
-#undef		pthread_cond_wait
-#undef		pthread_condattr_destroy
-#undef		pthread_condattr_getclock
-#undef		pthread_condattr_getpshared
-#undef		pthread_condattr_init
-#undef		pthread_condattr_setclock
-#undef		pthread_condattr_setpshared
-#undef		pthread_create
-#undef		pthread_detach
-#undef		pthread_equal
-#undef		pthread_exit
-#undef		pthread_getaffinity_np
-#undef		pthread_getconcurrency
-#undef		pthread_getcpuclockid
-#undef		pthread_getprio
-#undef		pthread_getschedparam
-#undef		pthread_getspecific
-#undef		pthread_join
-#undef		pthread_key_create
-#undef		pthread_key_delete
-#undef		pthread_kill
-#undef		pthread_main_np
-#undef		pthread_multi_np
-#undef		pthread_mutex_destroy
-#undef		pthread_mutex_getprioceiling
-#undef		pthread_mutex_init
-#undef		pthread_mutex_isowned_np
-#undef		pthread_mutex_lock
-#undef		pthread_mutex_setprioceiling
-#undef		pthread_mutex_timedlock
-#undef		pthread_mutex_trylock
-#undef		pthread_mutex_unlock
-#undef		pthread_mutexattr_destroy
-#undef		pthread_mutexattr_getkind_np
-#undef		pthread_mutexattr_getprioceiling
-#undef		pthread_mutexattr_getprotocol
-#undef		pthread_mutexattr_getpshared
-#undef		pthread_mutexattr_gettype
-#undef		pthread_mutexattr_init
-#undef		pthread_mutexattr_setkind_np
-#undef		pthread_mutexattr_setprioceiling
-#undef		pthread_mutexattr_setprotocol
-#undef		pthread_mutexattr_setpshared
-#undef		pthread_mutexattr_settype
-#undef		pthread_once
-#undef		pthread_resume_all_np
-#undef		pthread_resume_np
-#undef		pthread_rwlock_destroy
-#undef		pthread_rwlock_init
-#undef		pthread_rwlock_rdlock
-#undef		pthread_rwlock_timedrdlock
-#undef		pthread_rwlock_timedwrlock
-#undef		pthread_rwlock_tryrdlock
-#undef		pthread_rwlock_trywrlock
-#undef		pthread_rwlock_unlock
-#undef		pthread_rwlock_wrlock
-#undef		pthread_rwlockattr_destroy
-#undef		pthread_rwlockattr_getpshared
-#undef		pthread_rwlockattr_init
-#undef		pthread_rwlockattr_setpshared
-#undef		pthread_self
-#undef		pthread_set_name_np
-#undef		pthread_setaffinity_np
-#undef		pthread_setcancelstate
-#undef		pthread_setcanceltype
-#undef		pthread_setconcurrency
-#undef		pthread_setprio
-#undef		pthread_setschedparam
-#undef		pthread_setspecific
-#undef		pthread_sigmask
-#undef		pthread_single_np
-#undef		pthread_spin_destroy
-#undef		pthread_spin_init
-#undef		pthread_spin_lock
-#undef		pthread_spin_trylock
-#undef		pthread_spin_unlock
-#undef		pthread_suspend_all_np
-#undef		pthread_suspend_np
-#undef		pthread_switch_add_np
-#undef		pthread_switch_delete_np
-#undef		pthread_testcancel
-#undef		pthread_timedjoin_np
-#undef		pthread_yield
-#undef		read
-#undef		readv
-#undef		recvfrom
-#undef		recvmsg
-#undef		select
-#undef		sem_close
-#undef		sem_destroy
-#undef		sem_getvalue
-#undef		sem_init
-#undef		sem_open
-#undef		sem_post
-#undef		sem_timedwait
-#undef		sem_trywait
-#undef		sem_unlink
-#undef		sem_wait
-#undef		sendmsg
-#undef		sendto
-#undef		setsockopt
-#undef		sigaction
-#undef		sigprocmask
-#undef		sigsuspend
-#undef		socket
-#undef		socketpair
-#undef		usleep
-#undef		wait4
-#undef		waitpid
-#undef		write
-#undef		writev
-
-#if 0
-#undef		creat
-#undef		fchflags
-#undef		fchmod
-#undef		ftrylockfile
-#undef		msync
-#undef		nfssvc
-#undef		pause
-#undef		sched_yield
-#undef		sendfile
-#undef		shutdown
-#undef		sigaltstack
-#undef		sigpending
-#undef		sigreturn
-#undef		sigsetmask
-#undef		sleep
-#undef		system
-#undef		tcdrain
-#undef		wait
-#endif	/* 0 */
-
-#ifdef _SIGNAL_H_
-int     	_sigaction(int, const struct sigaction *, struct sigaction *);
-#endif
-
-#ifdef _SYS_EVENT_H_
-int		_kevent(int, const struct kevent *, int, struct kevent *,
-		    int, const struct timespec *);
-#endif
-
-#ifdef _SYS_FCNTL_H_
-int		_flock(int, int);
-#endif
-
-#undef		err
-#undef		warn
-#undef		nsdispatch
-
-#endif	/* _UN_NAMESPACE_H_ */
diff --git a/freebsd-userspace/rtems/include/namespace.h b/freebsd-userspace/rtems/include/namespace.h
new file mode 100644
index 0000000..0737da5
--- /dev/null
+++ b/freebsd-userspace/rtems/include/namespace.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) XXX
+ * 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 REGENTS 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.
+ */
+
+#ifndef _NAMESPACE_H_
+#define _NAMESPACE_H_
+
+/*
+ * Reverse the use of "hidden" names in the source code.
+ *
+ * README: When modifying this file don't forget to make the appropriate
+ *         changes in un-namespace.h!!!
+ */
+
+
+#define _pthread_getspecific		pthread_getspecific
+#define _pthread_key_create		pthread_key_create
+#define _pthread_main_np		pthread_main_np
+#define _pthread_once			pthread_once
+#define _pthread_setspecific		pthread_setspecific
+#define _read				read
+#define _recvfrom			recvfrom
+#define _sendto				sendto
+#define _setsockopt			setsockopt
+#define _socket				socket
+
+#define _close				close
+#define _connect			connect
+#define _writev				writev
+#define _getpeername			getpeername
+#define _getprogname			getprogname
+#define _getsockname			getsockname
+
+
+
+#endif /* _NAMESPACE_H_ */
diff --git a/freebsd-userspace/rtems/include/un-namespace.h b/freebsd-userspace/rtems/include/un-namespace.h
new file mode 100644
index 0000000..287a238
--- /dev/null
+++ b/freebsd-userspace/rtems/include/un-namespace.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) XXX
+ * 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 REGENTS 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 _UN_NAMESPACE_H_
+#define _UN_NAMESPACE_H_
+
+#endif	/* _UN_NAMESPACE_H_ */




More information about the vc mailing list