Update.

2000-12-04  Ulrich Drepper  <drepper@redhat.com>

	* configure.in: Define HAVE_ASM_GLOBAL_DOT_NAME for AIX.
	* config.h.in: Add HAVE_ASM_GLOBAL_DOT_NAME.
	* include/libc-symbols.h (strong_alias): Define special version
	for HAVE_ASM_GLOBAL_DOT_NAME.
	(weak_alias): Likewise.
	* sysdeps/powerpc/bsd-setjmp.S: Use strong_alias not .set.
	* sysdeps/unix/sysv/aix/Makefile [$(subdir)==login]
	(sysdep_routines): Add setutxent, getutxent, endutxent, getutxid,
	getutxline, pututxline, and utmpxname.
	* sysdeps/unix/sysv/aix/fchdir.c: Define __fchdir.
	* sysdeps/unix/sysv/aix/lseek.c: Define __libc_lseek alias.
	* sysdeps/unix/sysv/aix/open.c: Define __libc_open alias.
	* sysdeps/unix/sysv/aix/pread.c: Define pread alias.
	* sysdeps/unix/sysv/aix/pread64.c: Define pread64 alias.
	* sysdeps/unix/sysv/aix/sysdep.h (JUMPTARGET): Use C_TEXT.
	* sysdeps/unix/sysv/aix/bits/types.h: Define __clockid_t and __timer_t.
	* sysdeps/unix/sysv/aix/bits/utmp.h: Cleanup.  Add comments.
	* sysdeps/unix/sysv/linux/sys/param.h (MAXHOSTNAMELEN): Define.
	Patches by Michael Keezer <mkeezer@redhat.com>.

2 files changed, 26 insertions, 20 deletions

diff --git a/sysdeps/unix/sysv/aix/bits/types.h b/sysdeps/unix/sysv/aix/bits/types.h
index 830dcea7b0..a89393d704 100644
--- a/sysdeps/unix/sysv/aix/bits/types.h
+++ b/sysdeps/unix/sysv/aix/bits/types.h
@@ -87,6 +87,12 @@ typedef long int __swblk_t;		/* Type of a swap block maybe?  */
 
 typedef int __clock_t;
 
+/* Clock ID used in clock and timer functions.  */
+typedef int __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+typedef int __timer_t;
+
 /* One element in the file descriptor mask array.  */
 typedef unsigned long int __fd_mask;
 
diff --git a/sysdeps/unix/sysv/aix/bits/utmp.h b/sysdeps/unix/sysv/aix/bits/utmp.h
index 04844096b0..38cf31e6ed 100644
--- a/sysdeps/unix/sysv/aix/bits/utmp.h
+++ b/sysdeps/unix/sysv/aix/bits/utmp.h
@@ -1,5 +1,5 @@
 /* The `struct utmp' type, describing entries in the utmp file.  AIX.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,12 +21,9 @@
 # error "Never include <bits/utmp.h> directly; use <utmp.h> instead."
 #endif
 
-
-#include <time.h>
-
-#define _PATH_UTMP      "/etc/utmp"
-#define _PATH_WTMP      "/var/adm/wtmp"
-#define _PATH_LASTLOG   "/var/adm/lastlog"
+#include <paths.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
 
 #define UT_LINESIZE	12
@@ -52,22 +49,25 @@ struct utmp
   };
 
 
+/* Values for the `ut_type' field of a `struct utmp'.  */
+#define EMPTY		0	/* No valid user accounting information.  */
+
+#define RUN_LVL		1	/* The system's runlevel.  */
+#define BOOT_TIME	2	/* Time of system boot.  */
+#define OLD_TIME	3	/* Time when system clock changed.  */
+#define NEW_TIME	4	/* Time after system clock changed.  */
+
+#define INIT_PROCESS	5	/* Process spawned by the init process.  */
+#define LOGIN_PROCESS	6	/* Session leader of a logged in user.  */
+#define USER_PROCESS	7	/* Normal process.  */
+#define DEAD_PROCESS	8	/* Terminated process.  */
+
+#define ACCOUNTING	9
+
+
 /* Tell the user that we have a modern system with UT_HOST, UT_TYPE, and
    UT_ID fields.  */
 #define _HAVE_UT_TYPE	1
 #define _HAVE_UT_PID	1
 #define _HAVE_UT_ID	1
 #define _HAVE_UT_HOST	1
-
-
-/* Values for the `ut_type' field of a `struct utmp'.  */
-#define EMPTY		0
-#define RUN_LVL		1
-#define BOOT_TIME	2
-#define OLD_TIME	3
-#define NEW_TIME	4
-#define INIT_PROCESS	5
-#define LOGIN_PROCESS	6
-#define USER_PROCESS	7
-#define DEAD_PROCESS	8
-#define ACCOUNTING	9