--- Libc/Libc-498.1.7/include/NetBSD/utmpx.h.patch
+++ Libc/Libc-391/include/NetBSD/utmpx.h.patch
@@ -1,32 +1,6 @@
---- utmpx.h.orig	2008-07-17 11:34:24.000000000 -0700
-+++ utmpx.h	2008-07-17 11:57:27.000000000 -0700
-@@ -1,3 +1,25 @@
-+/*
-+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
-+ *
-+ * @APPLE_LICENSE_HEADER_START@
-+ * 
-+ * This file contains Original Code and/or Modifications of Original Code
-+ * as defined in and that are subject to the Apple Public Source License
-+ * Version 2.0 (the 'License'). You may not use this file except in
-+ * compliance with the License. Please obtain a copy of the License at
-+ * http://www.opensource.apple.com/apsl/ and read it before using this
-+ * file.
-+ * 
-+ * The Original Code and all software distributed under the License are
-+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-+ * Please see the License for the specific language governing rights and
-+ * limitations under the License.
-+ * 
-+ * @APPLE_LICENSE_HEADER_END@
-+ */
- /*	$NetBSD: utmpx.h,v 1.11 2003/08/26 16:48:32 wiz Exp $	 */
- 
- /*-
-@@ -38,28 +60,32 @@
+--- utmpx.h.orig	2004-08-05 14:37:28.000000000 -0700
++++ utmpx.h	2004-08-05 15:42:48.000000000 -0700
+@@ -38,28 +38,26 @@
  #ifndef	_UTMPX_H_
  #define	_UTMPX_H_
  
@@ -41,24 +15,16 @@
 +typedef __darwin_pid_t     pid_t;
 +#endif
 +
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-+#ifndef _UID_T
-+#define _UID_T
-+typedef __darwin_uid_t     uid_t;
-+#endif
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-+
  #define	_PATH_UTMPX		"/var/run/utmpx"
 -#define	_PATH_WTMPX		"/var/log/wtmpx"
 -#define	_PATH_LASTLOGX		"/var/log/lastlogx"
--#define	_PATH_UTMP_UPDATE	"/usr/libexec/utmp_update"
+ #define	_PATH_UTMP_UPDATE	"/usr/libexec/utmp_update"
  
--#define _UTX_USERSIZE	32
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
++#ifndef _POSIX_C_SOURCE
 +#define	UTMPX_FILE	_PATH_UTMPX
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
++#endif /* _POSIX_C_SOURCE */
 +
-+#define _UTX_USERSIZE	256	/* matches MAXLOGNAME */
+ #define _UTX_USERSIZE	32
  #define _UTX_LINESIZE	32
  #define	_UTX_IDSIZE	4
  #define _UTX_HOSTSIZE	256
@@ -73,23 +39,15 @@
  #define EMPTY		0
  #define RUN_LVL		1
  #define BOOT_TIME	2
-@@ -70,74 +96,87 @@
+@@ -69,75 +67,35 @@
+ #define LOGIN_PROCESS	6
  #define USER_PROCESS	7
  #define DEAD_PROCESS	8
- 
+-
 -#if defined(_NETBSD_SOURCE)
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
  #define ACCOUNTING	9
  #define SIGNATURE	10
 -#endif
-+#define SHUTDOWN_TIME	11
-+
-+#define UTMPX_AUTOFILL_MASK			0x8000
-+#define UTMPX_DEAD_IF_CORRESPONDING_MASK	0x4000
-+
-+/* notify(3) change notification name */
-+#define UTMPX_CHANGE_NOTIFICATION		"com.apple.system.utmpx"
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
  
  /*
   * The following structure describes the fields of the utmpx entries
@@ -99,11 +57,9 @@
   * entries using routines described in getutxent(3).
   */
  
-+#ifdef _UTMPX_COMPAT
- #define ut_user ut_name
- #define ut_xtime ut_tv.tv_sec
-+#endif /* _UTMPX_COMPAT */
- 
+-#define ut_user ut_name
+-#define ut_xtime ut_tv.tv_sec
+-
  struct utmpx {
 -	char ut_name[_UTX_USERSIZE];	/* login name */
 -	char ut_id[_UTX_IDSIZE];	/* inittab id */
@@ -122,20 +78,18 @@
 +	short ut_type;			/* type of this entry */
  	struct timeval ut_tv;		/* time entry was created */
 -	uint32_t ut_pad[10];		/* reserved for future use */
+-};
+-
+-#if defined(_NETBSD_SOURCE)
+-struct lastlogx {
+-	struct timeval ll_tv;		/* time entry was created */
+-	char ll_line[_UTX_LINESIZE];	/* tty name */
+-	char ll_host[_UTX_HOSTSIZE];	/* host name */
+-	struct sockaddr_storage ll_ss;	/* address where entry was made from */
 +	char ut_host[_UTX_HOSTSIZE];	/* host name */
 +	__uint32_t ut_pad[16];		/* reserved for future use */
  };
- 
--#if defined(_NETBSD_SOURCE)
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
- struct lastlogx {
- 	struct timeval ll_tv;		/* time entry was created */
- 	char ll_line[_UTX_LINESIZE];	/* tty name */
- 	char ll_host[_UTX_HOSTSIZE];	/* host name */
--	struct sockaddr_storage ll_ss;	/* address where entry was made from */
- };
 -#endif	/* !_XOPEN_SOURCE */
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
  
  __BEGIN_DECLS
  
@@ -162,43 +116,14 @@
 -void getutmpx __P((const struct utmp *, struct utmpx *));
 -
 -int utmpxname __P((const char *));
-+void	endutxent(void);
- 
+-
 -#endif /* _NETBSD_SOURCE */
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-+void	endutxent_wtmp(void);
-+struct lastlogx *
-+	getlastlogx(uid_t, struct lastlogx *);
-+struct lastlogx *
-+	getlastlogxbyname(const char*, struct lastlogx *);
-+#ifdef UNIFDEF_LEGACY_UTMP_APIS
-+struct utmp;	/* forward reference */
-+void	getutmp(const struct utmpx *, struct utmp *);
-+void	getutmpx(const struct utmp *, struct utmpx *);
-+#endif /* UNIFDEF_LEGACY_UTMP_APIS */
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-+
-+struct utmpx *
-+	getutxent(void);
-+
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-+struct utmpx *
-+	getutxent_wtmp(void);
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-+
-+struct utmpx *
-+	getutxid(const struct utmpx *);
-+struct utmpx *
-+	getutxline(const struct utmpx *);
-+struct utmpx *
-+	pututxline(const struct utmpx *);
-+void	setutxent(void);
-+
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-+void	setutxent_wtmp(int);
-+int	utmpxname(const char *);
-+int	wtmpxname(const char *);
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
++void setutxent(void);
++void endutxent(void);
++struct utmpx *getutxent(void);
++struct utmpx *getutxid(const struct utmpx *);
++struct utmpx *getutxline(const struct utmpx *);
++struct utmpx *pututxline(const struct utmpx *);
  
  __END_DECLS