diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-25 19:51:33 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-25 19:51:33 +0000 |
| commit | 4c83e7cbab75ede8fd63cf0619e7b69041ae57f0 (patch) | |
| tree | 248bb6af58d66aec13f6a02b9c0cce7a33cb29a2 /libjava/include | |
| parent | 462510b284a2390f4d84c5ed620abbe077740a3a (diff) | |
| download | gcc-4c83e7cbab75ede8fd63cf0619e7b69041ae57f0.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121183 138bc75d-0d04-0410-961f-82ee72b054a4
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 6d82df3af4f..50e054ac423 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 3b6e891af3d..6a5bc9696c6 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 |