From kwaclaw at users.sourceforge.net Mon Mar 6 15:24:39 2006 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Mon, 06 Mar 2006 06:24:39 -0800 Subject: [Expat-checkins] expat Makefile.in,1.54,1.55 Message-ID: <20060306152631.27A8A1E4007@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19502 Modified Files: Makefile.in Log Message: Applied patch #1437840. Fix for bugs #1414066 and #1033965 . Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- Makefile.in 25 Jan 2006 23:04:46 -0000 1.54 +++ Makefile.in 6 Mar 2006 14:24:36 -0000 1.55 @@ -44,9 +44,7 @@ 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 @@ done CC = @CC@ +CXX = @CXX@ LIBTOOL = @LIBTOOL@ INCLUDES = -I$(srcdir)/lib -I. @@ -158,10 +157,10 @@ 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 @@ 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 $< From kwaclaw at users.sourceforge.net Mon Mar 6 15:24:39 2006 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Mon, 06 Mar 2006 06:24:39 -0800 Subject: [Expat-checkins] expat/lib expat_external.h,1.6,1.7 Message-ID: <20060306152632.814251E4007@bag.python.org> Update of /cvsroot/expat/expat/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19502/lib Modified Files: expat_external.h Log Message: Applied patch #1437840. Fix for bugs #1414066 and #1033965 . Index: expat_external.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat_external.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- expat_external.h 28 Dec 2005 06:07:52 -0000 1.6 +++ expat_external.h 6 Mar 2006 14:24:36 -0000 1.7 @@ -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 From kwaclaw at users.sourceforge.net Mon Mar 6 15:24:39 2006 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Mon, 06 Mar 2006 06:24:39 -0800 Subject: [Expat-checkins] expat/tests minicheck.h, 1.4, 1.5 runtests.c, 1.62, 1.63 Message-ID: <20060306153313.2CAF81E4007@bag.python.org> Update of /cvsroot/expat/expat/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19502/tests Modified Files: minicheck.h runtests.c Log Message: Applied patch #1437840. Fix for bugs #1414066 and #1033965 . Index: minicheck.h =================================================================== RCS file: /cvsroot/expat/expat/tests/minicheck.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- minicheck.h 28 Jan 2005 06:32:31 -0000 1.4 +++ minicheck.h 6 Mar 2006 14:24:36 -0000 1.5 @@ -18,6 +18,13 @@ #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__); \ { Index: runtests.c =================================================================== RCS file: /cvsroot/expat/expat/tests/runtests.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- runtests.c 28 Dec 2005 06:06:11 -0000 1.62 +++ runtests.c 6 Mar 2006 14:24:36 -0000 1.63 @@ -1176,7 +1176,7 @@ 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; From ssolie at users.sourceforge.net Sun Mar 19 05:45:46 2006 From: ssolie at users.sourceforge.net (Steven Solie) Date: Sat, 18 Mar 2006 20:45:46 -0800 Subject: [Expat-checkins] expat/amiga Makefile,1.4,1.5 Message-ID: <20060319044547.4026D1E400E@bag.python.org> Update of /cvsroot/expat/expat/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25615 Modified Files: Makefile Log Message: changed default sharedlibdir Index: Makefile =================================================================== RCS file: /cvsroot/expat/expat/amiga/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 30 Dec 2005 04:18:13 -0000 1.4 +++ Makefile 19 Mar 2006 04:45:43 -0000 1.5 @@ -14,7 +14,7 @@ tooldir = SDK:Local/C staticlibdir = SDK:Local/clib2/lib staticincludedir = SDK:Local/clib2/include -sharedlibdir = LIBS: +sharedlibdir = SDK:Local/Libs sharedincludedir = SDK:Local/common/include From ssolie at users.sourceforge.net Sun Mar 19 05:33:01 2006 From: ssolie at users.sourceforge.net (Steven Solie) Date: Sat, 18 Mar 2006 20:33:01 -0800 Subject: [Expat-checkins] expat/amiga stdlib.c,1.1,1.2 Message-ID: <20060319052607.AB5361E4016@bag.python.org> Update of /cvsroot/expat/expat/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21116 Modified Files: stdlib.c Log Message: now allocates shared memory and frees the correct memory block Index: stdlib.c =================================================================== RCS file: /cvsroot/expat/expat/amiga/stdlib.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- stdlib.c 24 Dec 2005 06:39:56 -0000 1.1 +++ stdlib.c 19 Mar 2006 04:32:58 -0000 1.2 @@ -30,7 +30,7 @@ { uint32 size = sizeof(uint32) + len; - uint32 *mem = AllocMem(size, MEMF_ANY); + uint32 *mem = AllocMem(size, MEMF_SHARED); if ( mem != 0 ) { *mem = size; ++mem; @@ -67,8 +67,8 @@ void free (void * mem) { if ( mem != 0 ) { - uint32 size = *(((uint32*)mem) - 1); - FreeMem(mem, size); + uint32 * size_ptr = ((uint32*)mem) - 1; + FreeMem(size_ptr, *size_ptr); } } From ssolie at users.sourceforge.net Sun Mar 19 05:34:37 2006 From: ssolie at users.sourceforge.net (Steven Solie) Date: Sat, 18 Mar 2006 20:34:37 -0800 Subject: [Expat-checkins] expat/amiga README.txt,1.3,1.4 Message-ID: <20060319052609.3A7131E4027@bag.python.org> Update of /cvsroot/expat/expat/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21735 Modified Files: README.txt Log Message: added 4.1 notes Index: README.txt =================================================================== RCS file: /cvsroot/expat/expat/amiga/README.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README.txt 27 Dec 2005 15:45:30 -0000 1.3 +++ README.txt 19 Mar 2006 04:34:35 -0000 1.4 @@ -14,6 +14,9 @@ HISTORY ======= +4.1 - fixed memory freeing bug in shared library version + - now allocates shared memory + 4.0 - updated for corresponding Expat 2.0 release - some minor CVS related changes From ssolie at users.sourceforge.net Sun Mar 19 05:35:29 2006 From: ssolie at users.sourceforge.net (Steven Solie) Date: Sat, 18 Mar 2006 20:35:29 -0800 Subject: [Expat-checkins] expat/amiga expat_lib.c,1.2,1.3 Message-ID: <20060319052741.02A931E400E@bag.python.org> Update of /cvsroot/expat/expat/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22084 Modified Files: expat_lib.c Log Message: bumped version to 4.1 Index: expat_lib.c =================================================================== RCS file: /cvsroot/expat/expat/amiga/expat_lib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- expat_lib.c 27 Dec 2005 15:48:13 -0000 1.2 +++ expat_lib.c 19 Mar 2006 04:35:27 -0000 1.3 @@ -1,5 +1,5 @@ /* -** Copyright (c) 2001-2005 Expat maintainers. +** Copyright (c) 2001-2006 Expat maintainers. ** ** Permission is hereby granted, free of charge, to any person obtaining ** a copy of this software and associated documentation files (the @@ -27,8 +27,8 @@ #define LIBNAME "expat.library" #define LIBPRI 0 #define VERSION 4 -#define REVISION 0 -#define VSTRING "expat.library 4.0 (27.12.2005)" /* dd.mm.yyyy */ +#define REVISION 1 +#define VSTRING "expat.library 4.1 (18.3.2005)" /* dd.mm.yyyy */ static const char* __attribute__((used)) verstag = "\0$VER: " VSTRING;