organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-07 06:04:59 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Applied patch #1437840. Fix for bugs #1414066 and #1033965 .

Browse source
This commit is contained in:
Karl Waclawek 2006-03-06 14:24:36 +00:00
parent e5bee8cde7
commit 65fb6b9167
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
expat/Makefile.in
View file

@ -44,9 +44,7 @@ MANFILE = $(srcdir)/doc/xmlwf.1
APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
LIBRARY = libexpat.la
ifndef INSTALL_ROOT
INSTALL_ROOT=$(DESTDIR)
endif
default: buildlib xmlwf/xmlwf
@ -103,6 +101,7 @@ mkdir-init:
done
CC = @CC@
CXX = @CXX@
LIBTOOL = @LIBTOOL@
INCLUDES = -I$(srcdir)/lib -I.
@ -158,10 +157,10 @@ tests/chardata.o: tests/chardata.c tests/chardata.h
tests/minicheck.o: tests/minicheck.c tests/minicheck.h
tests/runtests.o: tests/runtests.c tests/chardata.h
tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
$(LINK_EXE) $^
$(LINK_EXE) tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
$(LINK_CXX_EXE) $^
$(LINK_CXX_EXE) tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
tests/xmlts.zip:
wget --output-document=tests/xmlts.zip \
@ -173,7 +172,7 @@ tests/XML-Test-Suite: tests/xmlts.zip
run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite
tests/xmltest.sh
.SUFFIXES: .c .lo .o
.SUFFIXES: .c .cpp .lo .o
.cpp.o:
$(CXXCOMPILE) -o $@ -c $<

2
expat/lib/expat_external.h
View file

@ -36,7 +36,7 @@
#ifndef XMLCALL
#if defined(XML_USE_MSC_EXTENSIONS)
#define XMLCALL __cdecl
#elif defined(__GNUC__) && defined(__i386)
#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER)
#define XMLCALL __attribute__((cdecl))
#else
/* For any platform which uses this definition and supports more than

7
expat/tests/minicheck.h
View file

@ -18,6 +18,13 @@ extern "C" {
#define CK_NORMAL 1
#define CK_VERBOSE 2
/* Workaround for Tru64 Unix systems where the C compiler has a working
__func__, but the C++ compiler only has a working __FUNCTION__. This
could be fixed in configure.in, but it's not worth it right now. */
#if defined(__osf__) && defined(__cplusplus)
#define __func__ __FUNCTION__
#endif
#define START_TEST(testname) static void testname(void) { \
_check_set_test_info(__func__, __FILE__, __LINE__); \
{

2
expat/tests/runtests.c
View file

@ -1176,7 +1176,7 @@ external_entity_handler(XML_Parser parser,
const XML_Char *systemId,
const XML_Char *publicId)
{
int callno = 1 + (int)XML_GetUserData(parser);
long callno = 1 + (long)XML_GetUserData(parser);
char *text;
XML_Parser p2;