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
This commit is contained in:
Tom Tromey
Tom Tromey
parent
8de15ffc9d
commit
7679f36836
|
|
@ -1,3 +1,10 @@
|
|||
2007-01-31 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
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.
|
||||
|
||||
2007-01-30 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* Makefile.in: Rebuilt.
|
||||
|
|
|
|||
|
|
@ -15768,6 +15768,75 @@ _ACEOF
|
|||
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking for magic_t" >&5
|
||||
echo $ECHO_N "checking for magic_t... $ECHO_C" >&6
|
||||
if test "${ac_cv_type_magic_t+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#ifdef HAVE_MAGIC_H
|
||||
#include <magic.h>
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
if ((magic_t *) 0)
|
||||
return 0;
|
||||
if (sizeof (magic_t))
|
||||
return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_type_magic_t=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_type_magic_t=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_type_magic_t" >&5
|
||||
echo "${ECHO_T}$ac_cv_type_magic_t" >&6
|
||||
if test $ac_cv_type_magic_t = yes; then
|
||||
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_MAGIC_T 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for in_addr_t" >&5
|
||||
echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6
|
||||
|
|
|
|||
|
|
@ -1383,6 +1383,11 @@ AC_CHECK_HEADERS(inttypes.h, [
|
|||
AC_HEADER_SYS_WAIT
|
||||
|
||||
AC_CHECK_TYPE([ssize_t], [int])
|
||||
AC_CHECK_TYPE([magic_t], [
|
||||
AC_DEFINE(HAVE_MAGIC_T, 1, [Define if magic.h declares magic_t])], [], [
|
||||
#ifdef HAVE_MAGIC_H
|
||||
#include <magic.h>
|
||||
#endif])
|
||||
|
||||
AC_MSG_CHECKING([for in_addr_t])
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
|
||||
|
|
|
|||
|
|
@ -187,6 +187,9 @@
|
|||
/* Define to 1 if you have the <magic.h> header file. */
|
||||
#undef HAVE_MAGIC_H
|
||||
|
||||
/* Define if magic.h declares magic_t */
|
||||
#undef HAVE_MAGIC_T
|
||||
|
||||
/* Define to 1 if you have the `memcpy' function. */
|
||||
#undef HAVE_MEMCPY
|
||||
|
||||
|
|
|
|||
|
|
@ -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) */
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue