diff options
author | kwaclaw <kwaclaw> | 2012-03-03 23:45:53 +0000 |
---|---|---|
committer | kwaclaw <kwaclaw> | 2012-03-03 23:45:53 +0000 |
commit | 35b8bc5993e83edcc835b96cf8f0f31d690376db (patch) | |
tree | da9f82f5bb8dc334c092c24b7843e9d8a5d35665 | |
parent | d9ba8dcd184ffa4a59362e75f6519b125a729195 (diff) | |
download | libexpat-35b8bc5993e83edcc835b96cf8f0f31d690376db.tar.gz |
- Added check for CXX compiler to configure.in, to make the tests compileR_2_1_0_Beta
- Fixed invalid pointer cast (on 64bit systems) in runtests.c
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | tests/runtests.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 2b984fc..7e968c4 100644 --- a/configure.in +++ b/configure.in @@ -51,7 +51,6 @@ LIBAGE=6 AC_CONFIG_HEADER(expat_config.h) -sinclude(conftools/libtool.m4) sinclude(conftools/ac_c_bigendian_cross.m4) AC_LIBTOOL_WIN32_DLL @@ -63,6 +62,7 @@ AC_SUBST(LIBAGE) dnl Checks for programs. AC_PROG_CC +AC_PROG_CXX AC_PROG_INSTALL if test "$GCC" = yes ; then diff --git a/tests/runtests.c b/tests/runtests.c index 3521c08..614d6b2 100644 --- a/tests/runtests.c +++ b/tests/runtests.c @@ -12,6 +12,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <stdint.h> #include "expat.h" #include "chardata.h" @@ -1254,7 +1255,7 @@ external_entity_handler(XML_Parser parser, const XML_Char *systemId, const XML_Char *publicId) { - long callno = 1 + (long)XML_GetUserData(parser); + intptr_t callno = 1 + (intptr_t)XML_GetUserData(parser); char *text; XML_Parser p2; |