diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-01-11 18:58:13 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-01-11 18:58:13 +0000 |
| commit | 685c57e38c5c0c5fb5b3366de6fcfa271ec7cd25 (patch) | |
| tree | 9e3dabd621e7259fe8615c98df39e0223fc84b46 /libjava | |
| parent | 611a88e1ebf79e7e688ef084c18a753e7fb12491 (diff) | |
* java/lang/natSystem.cc (getpwuid_adaptor): New adaptor for
HP/UX. From David Scott Urban.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31332 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 13 |
2 files changed, 17 insertions, 1 deletions
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 <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 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 <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 |