--- Libc/Libc-763.13/include/NetBSD/utmpx.h.patch
+++ Libc/Libc-583/include/NetBSD/utmpx.h.patch
@@ -1,7 +1,5 @@
-Index: utmpx.h
-===================================================================
---- utmpx.h	(revision 59377)
-+++ utmpx.h	(working copy)
+--- 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.
@@ -28,17 +26,15 @@
  /*	$NetBSD: utmpx.h,v 1.11 2003/08/26 16:48:32 wiz Exp $	 */
  
  /*-
-@@ -38,28 +60,34 @@
+@@ -38,28 +60,32 @@
  #ifndef	_UTMPX_H_
  #define	_UTMPX_H_
  
-+#include <_types.h>
-+#include <sys/time.h>
- #include <sys/cdefs.h>
+-#include <sys/cdefs.h>
 -#include <sys/featuretest.h>
 -#include <sys/socket.h>
--#include <sys/time.h>
-+#include <Availability.h>
++#include <_types.h>
+ #include <sys/time.h>
  
 +#ifndef _PID_T
 +#define _PID_T
@@ -77,7 +73,7 @@
  #define EMPTY		0
  #define RUN_LVL		1
  #define BOOT_TIME	2
-@@ -70,75 +98,88 @@
+@@ -70,74 +96,87 @@
  #define USER_PROCESS	7
  #define DEAD_PROCESS	8
  
@@ -87,14 +83,14 @@
  #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
 - * stored in _PATH_UTMPX or _PATH_WTMPX. This is not the format the
@@ -149,8 +145,7 @@
 -struct utmpx *getutxid __P((const struct utmpx *));
 -struct utmpx *getutxline __P((const struct utmpx *));
 -struct utmpx *pututxline __P((const struct utmpx *));
-+void	endutxent(void);
- 
+-
 -#if defined(_NETBSD_SOURCE)
 -int updwtmpx __P((const char *, const struct utmpx *));
 -int lastlogxname __P((const char *));
@@ -165,29 +160,32 @@
 -struct utmp;
 -void getutmp __P((const struct utmpx *, struct utmp *));
 -void getutmpx __P((const struct utmp *, struct utmpx *));
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-+void	endutxent_wtmp(void) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
+-
+-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 *) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
++	getlastlogx(uid_t, struct lastlogx *);
 +struct lastlogx *
-+	getlastlogxbyname(const char*, struct lastlogx *)__OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
++	getlastlogxbyname(const char*, struct lastlogx *);
 +#ifdef UNIFDEF_LEGACY_UTMP_APIS
 +struct utmp;	/* forward reference */
-+void	getutmp(const struct utmpx *, struct utmp *) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
-+void	getutmpx(const struct utmp *, struct utmpx *) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
++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 */
- 
--int utmpxname __P((const char *));
++
 +struct utmpx *
 +	getutxent(void);
- 
--#endif /* _NETBSD_SOURCE */
-+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-+struct utmpx *
-+	getutxent_wtmp(void) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
- 
++
++#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 *
@@ -197,11 +195,10 @@
 +void	setutxent(void);
 +
 +#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-+void	setutxent_wtmp(int) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
-+int	utmpxname(const char *) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
-+int	wtmpxname(const char *) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
-+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-+
++void	setutxent_wtmp(int);
++int	utmpxname(const char *);
++int	wtmpxname(const char *);
++#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
+ 
  __END_DECLS
  
- #endif /* !_UTMPX_H_ */