diff options
| author | John David Anglin <dave.anglin@nrc-cnrc.gc.ca> | 2006-05-25 23:19:12 +0000 |
|---|---|---|
| committer | John David Anglin <danglin@gcc.gnu.org> | 2006-05-25 23:19:12 +0000 |
| commit | 5920d981108b58efb4d88b28180a6e948879d920 (patch) | |
| tree | a85fa626b85efafd000cef4ab27059638a9db419 | |
| parent | e92fb50114706dd60fc43ccec488a7ac99b5fa9b (diff) | |
| download | gcc-5920d981108b58efb4d88b28180a6e948879d920.zip gcc-5920d981108b58efb4d88b28180a6e948879d920.tar.gz gcc-5920d981108b58efb4d88b28180a6e948879d920.tar.bz2 | |
configure.ac: Add sys/rw_lock.h to AC_CHECK_HEADERS.
* configure.ac: Add sys/rw_lock.h to AC_CHECK_HEADERS.
* configure: Rebuilt.
* include/config.h.in: Likewise.
* include/posix.h: If HAVE_SYS_RW_LOCK_H is defined, include
<sys/rw_lock.h>.
From-SVN: r114121
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rwxr-xr-x | libjava/configure | 5 | ||||
| -rw-r--r-- | libjava/configure.ac | 2 | ||||
| -rw-r--r-- | libjava/include/config.h.in | 3 | ||||
| -rw-r--r-- | libjava/include/posix.h | 6 |
5 files changed, 21 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4cc7013..ac0388c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2006-05-25 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * configure.ac: Add sys/rw_lock.h to AC_CHECK_HEADERS. + * configure: Rebuilt. + * include/config.h.in: Likewise. + * include/posix.h: If HAVE_SYS_RW_LOCK_H is defined, include + <sys/rw_lock.h>. + 2006-05-24 Tom Tromey <tromey@redhat.com> PR libgcj/27024: diff --git a/libjava/configure b/libjava/configure index 9f4e8a7..85944a5 100755 --- a/libjava/configure +++ b/libjava/configure @@ -6254,7 +6254,7 @@ exec 5>>./config.log -for ac_prog in gcj +for ac_prog in gcj gcj-3.2 gcj-3.1 gcj-3.0 gcj-2.95 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -15136,11 +15136,12 @@ esac + for ac_header in unistd.h bstring.h sys/time.h sys/types.h fcntl.h \ sys/ioctl.h sys/filio.h sys/stat.h sys/select.h \ sys/socket.h netinet/in.h arpa/inet.h netdb.h net/if.h \ pwd.h sys/config.h stdint.h langinfo.h locale.h \ - dirent.h + dirent.h sys/rw_lock.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/libjava/configure.ac b/libjava/configure.ac index 6b97979..a25a179 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1276,7 +1276,7 @@ AC_CHECK_HEADERS([unistd.h bstring.h sys/time.h sys/types.h fcntl.h \ sys/ioctl.h sys/filio.h sys/stat.h sys/select.h \ sys/socket.h netinet/in.h arpa/inet.h netdb.h net/if.h \ pwd.h sys/config.h stdint.h langinfo.h locale.h \ - dirent.h]) + dirent.h sys/rw_lock.h]) AC_CHECK_HEADERS(inttypes.h, [ AC_DEFINE(HAVE_INTTYPES_H, 1, [Define if <inttypes.h> is available]) AC_DEFINE(JV_HAVE_INTTYPES_H, 1, [Define if <inttypes.h> is available]) diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index a57dd83..5d67c85 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -292,6 +292,9 @@ /* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H +/* Define to 1 if you have the <sys/rw_lock.h> header file. */ +#undef HAVE_SYS_RW_LOCK_H + /* Define to 1 if you have the <sys/select.h> header file. */ #undef HAVE_SYS_SELECT_H diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 63fc135..5b74eb7 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -37,6 +37,12 @@ details. */ #include <fcntl.h> +/* The header file <sys/rw_lock.h> needs to be included before javaprims.h + on HP-UX 11 to avoid a compilation error. */ +#ifdef HAVE_SYS_RW_LOCK_H +#include <sys/rw_lock.h> +#endif + #include <gcj/cni.h> #include <java/util/Properties.h> |