diff options
| author | Andrew Haley <aph@redhat.com> | 2007-01-25 19:51:33 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-25 19:51:33 +0000 |
| commit | 9fe944471ab5828c0e4564780a57173a70cc4506 (patch) | |
| tree | 248bb6af58d66aec13f6a02b9c0cce7a33cb29a2 /libjava/include | |
| parent | a942e89f3acac05d7099f3ae12ee6a6fd531a051 (diff) | |
| download | gcc-9fe944471ab5828c0e4564780a57173a70cc4506.zip gcc-9fe944471ab5828c0e4564780a57173a70cc4506.tar.gz gcc-9fe944471ab5828c0e4564780a57173a70cc4506.tar.bz2 | |
configure, [...]: Rebuilt.
2007-01-25 Andrew Haley <aph@redhat.com>
* configure, Makefile.in, include/config.h.in: Rebuilt.
* Makefile.am (libgcj_la_LIBADD): Removed $(LIBMAGIC).
* configure.ac: Don't check for libmagic.
* java/net/natVMURLConnection.cc (p_magic_open, p_magic_load,
p_magic_close, p_magic_buffer): New globals.
(init): Look up 'magic' functions.
(guessContentTypeFromBuffer): Updated.
From-SVN: r121183
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/include/config.h.in | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 6d82df3..50e054a 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -171,7 +171,6 @@ LIBGCJ_LD_SYMBOLIC_FUNCTIONS = @LIBGCJ_LD_SYMBOLIC_FUNCTIONS@ LIBGCJ_SPEC = @LIBGCJ_SPEC@ LIBICONV = @LIBICONV@ LIBLTDL = @LIBLTDL@ -LIBMAGIC = @LIBMAGIC@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index 3b6e891..6a5bc96 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -187,9 +187,6 @@ /* Define to 1 if you have the <magic.h> header file. */ #undef HAVE_MAGIC_H -/* Define if you have magic_open(). */ -#undef HAVE_MAGIC_OPEN - /* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY |