[Expat-checkins] expat/tests minicheck.h, 1.4, 1.5 runtests.c, 1.62, 1.63

[Karl Waclawek]

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;