diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-01-31 17:11:11 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-31 17:11:11 +0000 |
| commit | 7679f368365a08bc6d68d152c02992ecd8ff5d20 (patch) | |
| tree | 8977e5f87f304a27fa54d1bcb814e71783beeaf1 /libjava/java/net | |
| parent | 8de15ffc9d9c4526bccc9f594edc8d8fdc57f83a (diff) | |
| download | gcc-7679f368365a08bc6d68d152c02992ecd8ff5d20.zip gcc-7679f368365a08bc6d68d152c02992ecd8ff5d20.tar.gz gcc-7679f368365a08bc6d68d152c02992ecd8ff5d20.tar.bz2 | |
re PR libgcj/30606 (natVMURLConnection.cc:21: error: 'magic_t' does not name a typet name a type)
PR libgcj/30606:
* configure, include/config.h.in: Rebuilt.
* configure.ac: Check for magic_t in magic.h.
* java/net/natVMURLConnection.cc: Use HAVE_MAGIC_T.
From-SVN: r121425
Diffstat (limited to 'libjava/java/net')
| -rw-r--r-- | libjava/java/net/natVMURLConnection.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libjava/java/net/natVMURLConnection.cc b/libjava/java/net/natVMURLConnection.cc index 643f90a..a683fc6 100644 --- a/libjava/java/net/natVMURLConnection.cc +++ b/libjava/java/net/natVMURLConnection.cc @@ -13,7 +13,7 @@ details. */ #include <java/lang/UnsupportedOperationException.h> #include <stdio.h> -#if defined (HAVE_MAGIC_H) && defined (USE_LTDL) +#if defined (HAVE_MAGIC_T) && defined (HAVE_MAGIC_H) && defined (USE_LTDL) #include <magic.h> #include <ltdl.h> @@ -26,12 +26,12 @@ static void (*p_magic_close)(magic_t cookie); static const char * (*p_magic_buffer) (magic_t cookie, const void *buffer, size_t length); -#endif /* HAVE_MAGIC_H && defined (USE_LTDL) */ +#endif /* HAVE_MAGIC_T && HAVE_MAGIC_H && defined (USE_LTDL) */ void java::net::VMURLConnection::init () { -#if defined (HAVE_MAGIC_H) && defined (USE_LTDL) +#if defined (HAVE_MAGIC_T) && defined (HAVE_MAGIC_H) && defined (USE_LTDL) lt_dlhandle handle = lt_dlopenext ("libmagic.so"); if (!handle) return; @@ -57,14 +57,14 @@ java::net::VMURLConnection::init () p_magic_close (cookie); cookie = (magic_t) NULL; } -#endif /* HAVE_MAGIC_H && defined (USE_LTDL) */ +#endif /* HAVE_MAGIC_T && HAVE_MAGIC_H && defined (USE_LTDL) */ } ::java::lang::String * java::net::VMURLConnection::guessContentTypeFromBuffer (jbyteArray bytes, jint valid) { -#if defined (HAVE_MAGIC_H) && defined (USE_LTDL) +#if defined (HAVE_MAGIC_T) && defined (HAVE_MAGIC_H) && defined (USE_LTDL) const char *result; if (cookie == (magic_t) NULL) @@ -77,5 +77,5 @@ java::net::VMURLConnection::guessContentTypeFromBuffer (jbyteArray bytes, return _Jv_NewStringUTF (result); #else return NULL; -#endif /* HAVE_MAGIC_H && defined (USE_LTDL) */ +#endif /* HAVE_MAGIC_T && HAVE_MAGIC_H && defined (USE_LTDL) */ } |