From 6baee4c5c3a5022e35c6f8e18f6dada4659049e5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 11 Jan 2000 18:58:13 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 5 +++++ libjava/java/lang/natSystem.cc | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fdd5fe1f612..a46f7fe95eb 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2000-01-11 Tom Tromey + + * java/lang/natSystem.cc (getpwuid_adaptor): New adaptor for + HP/UX. From David Scott Urban. + 2000-01-10 Jeff Sturm * 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 1519647aebe..a3d1b5b75ee 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 +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 static inline int -- 2.30.2