aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>2000-01-11 18:58:13 +0000
committerTom Tromey <tromey@gcc.gnu.org>2000-01-11 18:58:13 +0000
commit6baee4c5c3a5022e35c6f8e18f6dada4659049e5 (patch)
tree9e3dabd621e7259fe8615c98df39e0223fc84b46
parent519104fe1ada7514354e982779db4657b8bf85da (diff)
downloadgcc-6baee4c5c3a5022e35c6f8e18f6dada4659049e5.zip
gcc-6baee4c5c3a5022e35c6f8e18f6dada4659049e5.tar.gz
gcc-6baee4c5c3a5022e35c6f8e18f6dada4659049e5.tar.bz2
natSystem.cc (getpwuid_adaptor): New adaptor for HP/UX.
* java/lang/natSystem.cc (getpwuid_adaptor): New adaptor for HP/UX. From David Scott Urban. From-SVN: r31332
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/natSystem.cc13
2 files changed, 17 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fdd5fe1..a46f7fe 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-11 Tom Tromey <tromey@cygnus.com>
+
+ * java/lang/natSystem.cc (getpwuid_adaptor): New adaptor for
+ HP/UX. From David Scott Urban.
+
2000-01-10 Jeff Sturm <jsturm@sigma6.com>
* java/lang/natMath.cc (pow): Cast args to `double', not
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 1519647..a3d1b5b 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -1,6 +1,6 @@
// natSystem.cc - Native code implementing System class.
-/* Copyright (C) 1998, 1999 Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000 Cygnus Solutions
This file is part of libgcj.
@@ -205,6 +205,17 @@ getpwuid_adaptor(int (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r,
return getpwuid_r (user_id, pwd_r, buf_r, len_r, pwd_entry);
}
+/* This is used on HPUX 10.20 */
+template <typename T_uid, typename T_passwd, typename T_buf, typename T_len>
+static inline int
+getpwuid_adaptor(int (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r,
+ T_buf *buf_r, T_len len_r),
+ uid_t user_id, struct passwd *pwd_r,
+ char *buf_r, size_t len_r, struct passwd **pwd_entry)
+{
+ return getpwuid_r (user_id, pwd_r, buf_r, len_r);
+}
+
/* This is used on IRIX 5.2. */
template <typename T_uid, typename T_passwd, typename T_buf, typename T_len>
static inline int