Index: trunk/src/emx/src/include/libc_private.h
===================================================================
--- trunk/src/emx/src/include/libc_private.h	(revision 1869)
+++ 	(revision )
@@ -1,3 +1,0 @@
-/* placeholder */
-extern const char *__progname;
-
Index: trunk/src/emx/src/include/namespace.h
===================================================================
--- trunk/src/emx/src/include/namespace.h	(revision 1869)
+++ 	(revision )
@@ -1,35 +1,0 @@
-/** $Id$ */
-/** @file
- * Replacement for the BSD namespace wrapper.
- */
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-#include "libc-alias.h"
-/* kill these as they're handles by alias/aliasbsdfuncs.awk */
-#define __weak_reference(a,b)
-#define __make_alias(a,b)
-
-#define err _err
-#define warn _warn
-#define getprogname _getprogname
-
-#define _fsync      _STD(fsync)
-#define _fstat      _STD(fstat)
-#define _fcntl      _STD(fcntl)
-#define _writev     _STD(writev)
-#define _readv      _STD(readv)
-#define _close      _STD(close)
-#define _open       _STD(open)
-#define _read       _STD(read)
-#define _write      _STD(write)
-#define _connect    connect
-#define _socket     socket
-#define __strtok_r  _STD(strtok_r)
-#define _fpathconf  _STD(fpathconf)
-#define _statfs     _STD(statfs)
-#define _fstatfs    _STD(fstatfs)
-#define nsdispatch  _nsdispatch
-#define _sigprocmask _STD(sigprocmask)
-
-#endif
-
Index: trunk/src/emx/src/include/nss_tls.h
===================================================================
--- trunk/src/emx/src/include/nss_tls.h	(revision 1869)
+++ 	(revision )
@@ -1,105 +1,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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: src/lib/libc/include/nss_tls.h,v 1.2 2003/04/21 15:44:25 nectar Exp $
- *
- * Macros which generate thread local storage handling code in NSS modules.
- */
-#ifndef _NSS_TLS_H_
-#define _NSS_TLS_H_
-
-#if 0 /* bird */
-
-#define NSS_TLS_HANDLING(name)					\
-static pthread_key_t name##_state_key;				\
-static	void	 name##_keyinit(void);				\
-static	int	 name##_getstate(struct name##_state **);	\
-\
-static void								\
-name##_keyinit(void)							\
-{									\
-	(void)_pthread_key_create(&name##_state_key, name##_endstate);	\
-}									\
-\
-static int							\
-name##_getstate(struct name##_state **p)			\
-{								\
-	static struct name##_state st;				\
-	static pthread_once_t	keyinit = PTHREAD_ONCE_INIT;	\
-	int			rv;				\
-								\
-	if (!__isthreaded || _pthread_main_np() != 0) {		\
-		*p = &st;					\
-		return (0);					\
-	}							\
-	rv = _pthread_once(&keyinit, name##_keyinit);		\
-	if (rv != 0)						\
-		return (rv);					\
-	*p = _pthread_getspecific(name##_state_key);		\
-	if (*p != NULL)						\
-		return (0);					\
-	*p = calloc(1, sizeof(**p));				\
-	if (*p == NULL)						\
-		return (ENOMEM);				\
-	rv = _pthread_setspecific(name##_state_key, *p);	\
-	if (rv != 0) {						\
-		free(*p);					\
-		*p = NULL;					\
-	}							\
-	return (rv);						\
-}								\
-/* allow the macro invocation to end with a semicolon */	\
-typedef int _##name##_bmVjdGFy
-
-#else
-/* Bird: this is a temporary hack till pthreads are implemented and we can test things. */
-#define NSS_TLS_HANDLING(name)					\
-static	void	 name##_keyinit(void);				\
-static	int	 name##_getstate(struct name##_state **);	\
-\
-static void							\
-name##_keyinit(void)						\
-{								\
-}								\
-\
-static int							\
-name##_getstate(struct name##_state **p)			\
-{								\
-	static struct name##_state st;				\
-	*p = &st;					        \
-	return (0);					        \
-}								\
-/* allow the macro invocation to end with a semicolon */	\
-typedef int _##name##_bmVjdGFy
-
-#endif
-
-#endif /* _NSS_TLS_H_ */
Index: trunk/src/emx/src/include/un-namespace.h
===================================================================
--- trunk/src/emx/src/include/un-namespace.h	(revision 1869)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/** $Id$ */
-/** @file
- * Replacement for the BSD namespace wrapper.
- */
-
-#ifndef _UN_NAMESPACE_H_
-#define _UN_NAMESPACE_H_
-
-#undef err
-#undef warn
-#undef getprogname
-
-#endif
-
-
Index: trunk/src/emx/src/lib/bsd/include/libc_private.h
===================================================================
--- trunk/src/emx/src/lib/bsd/include/libc_private.h	(revision 1870)
+++ trunk/src/emx/src/lib/bsd/include/libc_private.h	(revision 1870)
@@ -0,0 +1,3 @@
+/* placeholder */
+extern const char *__progname;
+
Index: trunk/src/emx/src/lib/bsd/include/namespace.h
===================================================================
--- trunk/src/emx/src/lib/bsd/include/namespace.h	(revision 1870)
+++ trunk/src/emx/src/lib/bsd/include/namespace.h	(revision 1870)
@@ -0,0 +1,35 @@
+/** $Id$ */
+/** @file
+ * Replacement for the BSD namespace wrapper.
+ */
+#ifndef _NAMESPACE_H_
+#define _NAMESPACE_H_
+#include "libc-alias.h"
+/* kill these as they're handles by alias/aliasbsdfuncs.awk */
+#define __weak_reference(a,b)
+#define __make_alias(a,b)
+
+#define err _err
+#define warn _warn
+#define getprogname _getprogname
+
+#define _fsync      _STD(fsync)
+#define _fstat      _STD(fstat)
+#define _fcntl      _STD(fcntl)
+#define _writev     _STD(writev)
+#define _readv      _STD(readv)
+#define _close      _STD(close)
+#define _open       _STD(open)
+#define _read       _STD(read)
+#define _write      _STD(write)
+#define _connect    connect
+#define _socket     socket
+#define __strtok_r  _STD(strtok_r)
+#define _fpathconf  _STD(fpathconf)
+#define _statfs     _STD(statfs)
+#define _fstatfs    _STD(fstatfs)
+#define nsdispatch  _nsdispatch
+#define _sigprocmask _STD(sigprocmask)
+
+#endif
+
Index: trunk/src/emx/src/lib/bsd/include/nss_tls.h
===================================================================
--- trunk/src/emx/src/lib/bsd/include/nss_tls.h	(revision 1870)
+++ trunk/src/emx/src/lib/bsd/include/nss_tls.h	(revision 1870)
@@ -0,0 +1,105 @@
+/*-
+ * Copyright (c) 2003 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by
+ * Jacques A. Vidrine, Safeport Network Services, and Network
+ * Associates Laboratories, the Security Research Division of Network
+ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
+ *
+ * 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: src/lib/libc/include/nss_tls.h,v 1.2 2003/04/21 15:44:25 nectar Exp $
+ *
+ * Macros which generate thread local storage handling code in NSS modules.
+ */
+#ifndef _NSS_TLS_H_
+#define _NSS_TLS_H_
+
+#if 0 /* bird */
+
+#define NSS_TLS_HANDLING(name)					\
+static pthread_key_t name##_state_key;				\
+static	void	 name##_keyinit(void);				\
+static	int	 name##_getstate(struct name##_state **);	\
+\
+static void								\
+name##_keyinit(void)							\
+{									\
+	(void)_pthread_key_create(&name##_state_key, name##_endstate);	\
+}									\
+\
+static int							\
+name##_getstate(struct name##_state **p)			\
+{								\
+	static struct name##_state st;				\
+	static pthread_once_t	keyinit = PTHREAD_ONCE_INIT;	\
+	int			rv;				\
+								\
+	if (!__isthreaded || _pthread_main_np() != 0) {		\
+		*p = &st;					\
+		return (0);					\
+	}							\
+	rv = _pthread_once(&keyinit, name##_keyinit);		\
+	if (rv != 0)						\
+		return (rv);					\
+	*p = _pthread_getspecific(name##_state_key);		\
+	if (*p != NULL)						\
+		return (0);					\
+	*p = calloc(1, sizeof(**p));				\
+	if (*p == NULL)						\
+		return (ENOMEM);				\
+	rv = _pthread_setspecific(name##_state_key, *p);	\
+	if (rv != 0) {						\
+		free(*p);					\
+		*p = NULL;					\
+	}							\
+	return (rv);						\
+}								\
+/* allow the macro invocation to end with a semicolon */	\
+typedef int _##name##_bmVjdGFy
+
+#else
+/* Bird: this is a temporary hack till pthreads are implemented and we can test things. */
+#define NSS_TLS_HANDLING(name)					\
+static	void	 name##_keyinit(void);				\
+static	int	 name##_getstate(struct name##_state **);	\
+\
+static void							\
+name##_keyinit(void)						\
+{								\
+}								\
+\
+static int							\
+name##_getstate(struct name##_state **p)			\
+{								\
+	static struct name##_state st;				\
+	*p = &st;					        \
+	return (0);					        \
+}								\
+/* allow the macro invocation to end with a semicolon */	\
+typedef int _##name##_bmVjdGFy
+
+#endif
+
+#endif /* _NSS_TLS_H_ */
Index: trunk/src/emx/src/lib/bsd/include/un-namespace.h
===================================================================
--- trunk/src/emx/src/lib/bsd/include/un-namespace.h	(revision 1870)
+++ trunk/src/emx/src/lib/bsd/include/un-namespace.h	(revision 1870)
@@ -0,0 +1,15 @@
+/** $Id$ */
+/** @file
+ * Replacement for the BSD namespace wrapper.
+ */
+
+#ifndef _UN_NAMESPACE_H_
+#define _UN_NAMESPACE_H_
+
+#undef err
+#undef warn
+#undef getprogname
+
+#endif
+
+
