diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-31 17:11:11 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-31 17:11:11 +0000 |
| commit | 9bdb21a27a7b8e81043d6143ed795fba7de70e5c (patch) | |
| tree | 8977e5f87f304a27fa54d1bcb814e71783beeaf1 /libjava/java | |
| parent | 622de01c7f685ec445cef36e57fafa6bfa3d61c0 (diff) | |
| download | ppe42-gcc-9bdb21a27a7b8e81043d6143ed795fba7de70e5c.tar.gz ppe42-gcc-9bdb21a27a7b8e81043d6143ed795fba7de70e5c.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121425 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -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 643f90a978c..a683fc6fdaf 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) */ } |
