From 2c4878f63e7271faa9df67d33020658ec3dcd1b2 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 15 Dec 2002 02:35:28 +0000 Subject: [PATCH] HP-UX 10 xshares the same non-posix getpwuid_r signature as AIX. (#100756, Sat Dec 14 21:24:04 2002 Owen Taylor * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the same non-posix getpwuid_r signature as AIX. (#100756, Kai Poitschke) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gutils.c | 3 ++- 8 files changed, 44 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 87ea79ae0..902b12a56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 14 21:24:04 2002 Owen Taylor + + * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the + same non-posix getpwuid_r signature as AIX. + (#100756, Kai Poitschke) + Sat Dec 14 21:10:57 2002 Owen Taylor * glib/gthread.h: Mark the contents of the strucures diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 87ea79ae0..902b12a56 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Dec 14 21:24:04 2002 Owen Taylor + + * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the + same non-posix getpwuid_r signature as AIX. + (#100756, Kai Poitschke) + Sat Dec 14 21:10:57 2002 Owen Taylor * glib/gthread.h: Mark the contents of the strucures diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 87ea79ae0..902b12a56 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sat Dec 14 21:24:04 2002 Owen Taylor + + * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the + same non-posix getpwuid_r signature as AIX. + (#100756, Kai Poitschke) + Sat Dec 14 21:10:57 2002 Owen Taylor * glib/gthread.h: Mark the contents of the strucures diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 87ea79ae0..902b12a56 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Dec 14 21:24:04 2002 Owen Taylor + + * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the + same non-posix getpwuid_r signature as AIX. + (#100756, Kai Poitschke) + Sat Dec 14 21:10:57 2002 Owen Taylor * glib/gthread.h: Mark the contents of the strucures diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 87ea79ae0..902b12a56 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Dec 14 21:24:04 2002 Owen Taylor + + * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the + same non-posix getpwuid_r signature as AIX. + (#100756, Kai Poitschke) + Sat Dec 14 21:10:57 2002 Owen Taylor * glib/gthread.h: Mark the contents of the strucures diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 87ea79ae0..902b12a56 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Dec 14 21:24:04 2002 Owen Taylor + + * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the + same non-posix getpwuid_r signature as AIX. + (#100756, Kai Poitschke) + Sat Dec 14 21:10:57 2002 Owen Taylor * glib/gthread.h: Mark the contents of the strucures diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 87ea79ae0..902b12a56 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Dec 14 21:24:04 2002 Owen Taylor + + * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the + same non-posix getpwuid_r signature as AIX. + (#100756, Kai Poitschke) + Sat Dec 14 21:10:57 2002 Owen Taylor * glib/gthread.h: Mark the contents of the strucures diff --git a/glib/gutils.c b/glib/gutils.c index ad60e9ab2..06c4fd88b 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -782,7 +782,8 @@ g_get_any_init (void) error = getpwuid_r (getuid (), &pwd, buffer, bufsize, &pw); error = error < 0 ? errno : error; # else /* HAVE_NONPOSIX_GETPWUID_R */ -# ifdef _AIX + /* HPUX 11 falls into the HAVE_POSIX_GETPWUID_R case */ +# if defined(_AIX) || defined(__hpux) error = getpwuid_r (getuid (), &pwd, buffer, bufsize); pw = error == 0 ? &pwd : NULL; # else /* !_AIX */