Author: jberry
Date: Tue Jun 7 09:52:45 2005
New Revision: 188814
URL: http://svn.apache.org/viewcvs?rev=188814&view=rev
Log:
Check for inttypes.h, rather than stdint.h. inttypes.h is spec'd to include
stdint.h, and inttypes.h is more prevelant than stdint.h.
Modified:
xerces/c/branches/jberry/3.0-unstable/config.h.in
xerces/c/branches/jberry/3.0-unstable/configure.ac
xerces/c/branches/jberry/3.0-unstable/m4/xerces_int_types.m4
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.hpp.in
Modified: xerces/c/branches/jberry/3.0-unstable/config.h.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/config.h.in?rev=188814&r1=188813&r2=188814&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/config.h.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/config.h.in Tue Jun 7 09:52:45 2005
@@ -254,8 +254,8 @@
/* Define if namespaces is supported by the compiler */
#undef XERCES_HAS_CPP_NAMESPACE
-/* Define to 1 if we have stdint.h */
-#undef XERCES_HAVE_STDINT_H
+/* Define to 1 if we have inttypes.h */
+#undef XERCES_HAVE_INTTYPES_H
/* Define to 1 if we have sys/types.h */
#undef XERCES_HAVE_SYS_TYPES_H
Modified: xerces/c/branches/jberry/3.0-unstable/configure.ac
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure.ac?rev=188814&r1=188813&r2=188814&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure.ac (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure.ac Tue Jun 7 09:52:45 2005
@@ -162,8 +162,8 @@
AS_IF([test x$ac_cv_header_sys_types_h = xyes],
AC_DEFINE([XERCES_HAVE_SYS_TYPES_H], 1, [Define to 1 if we have
sys/types.h]))
-AS_IF([test x$ac_cv_header_stdint_h = xyes],
- AC_DEFINE([XERCES_HAVE_STDINT_H], 1, [Define to 1 if we have
stdint.h]))
+AS_IF([test x$ac_cv_header_inttypes_h = xyes],
+ AC_DEFINE([XERCES_HAVE_INTTYPES_H], 1, [Define to 1 if we have
inttypes.h]))
case $host in
*-*-msdos* | *-*-mingw32* | *-*-cygwin* | *-*-windows* )
Modified: xerces/c/branches/jberry/3.0-unstable/m4/xerces_int_types.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_int_types.m4?rev=188814&r1=188813&r2=188814&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_int_types.m4 (original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_int_types.m4 Tue Jun 7
09:52:45 2005
@@ -12,7 +12,7 @@
AC_DEFUN([XERCES_INT_TYPES],
[
- AC_CHECK_HEADERS([stdint.h])
+ AC_CHECK_HEADERS([inttypes.h])
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
@@ -25,7 +25,7 @@
# Select a signed 16 bit integer type
#
AC_CACHE_CHECK([for an appropriate signed 16 bit integer type],
[xerces_cv_type_s16bit_int], [
- AS_IF([test x$ac_cv_header_stdint_h = xyes && test
x$ac_cv_type_int16_t = xyes],
+ AS_IF([test x$ac_cv_header_inttypes_h = xyes && test
x$ac_cv_type_int16_t = xyes],
[xerces_cv_type_s16bit_int=int16_t],
[
if test $ac_cv_sizeof_int -eq 2; then
@@ -42,7 +42,7 @@
# Select an unsigned 16 bit integer type
#
AC_CACHE_CHECK([for an appropriate unsigned 16 bit integer type],
[xerces_cv_type_u16bit_int], [
- AS_IF([test x$ac_cv_header_stdint_h = xyes && test
x$ac_cv_type_uint16_t = xyes],
+ AS_IF([test x$ac_cv_header_inttypes_h = xyes && test
x$ac_cv_type_uint16_t = xyes],
[xerces_cv_type_u16bit_int=uint16_t],
[
if test $ac_cv_sizeof_int -eq 2; then
@@ -60,7 +60,7 @@
# Select a signed 32 bit integer type
#
AC_CACHE_CHECK([for an appropriate signed 32 bit integer type],
[xerces_cv_type_s32bit_int], [
- AS_IF([test x$ac_cv_header_stdint_h = xyes && test
x$ac_cv_type_int32_t = xyes],
+ AS_IF([test x$ac_cv_header_inttypes_h = xyes && test
x$ac_cv_type_int32_t = xyes],
[xerces_cv_type_s32bit_int=int32_t],
[
if test $ac_cv_sizeof_int -eq 4; then
@@ -77,7 +77,7 @@
# Select an unsigned 32 bit integer type
#
AC_CACHE_CHECK([for an appropriate unsigned 32 bit integer type],
[xerces_cv_type_u32bit_int], [
- AS_IF([test x$ac_cv_header_stdint_h = xyes && test
x$ac_cv_type_uint32_t = xyes],
+ AS_IF([test x$ac_cv_header_inttypes_h = xyes && test
x$ac_cv_type_uint32_t = xyes],
[xerces_cv_type_u32bit_int=uint32_t],
[
if test $ac_cv_sizeof_int -eq 4; then
Modified:
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.hpp.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.hpp.in?rev=188814&r1=188813&r2=188814&view=diff
==============================================================================
---
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.hpp.in
(original)
+++
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.hpp.in
Tue Jun 7 09:52:45 2005
@@ -45,7 +45,7 @@
// ---------------------------------------------------------------------------
#undef XERCES_AUTOCONF
#undef XERCES_HAVE_SYS_TYPES_H
-#undef XERCES_HAVE_STDINT_H
+#undef XERCES_HAVE_INTTYPES_H
#undef XERCES_S16BIT_INT
#undef XERCES_S32BIT_INT
@@ -67,8 +67,8 @@
// ---------------------------------------------------------------------------
// Include standard headers, if available, that we may rely on below.
// ---------------------------------------------------------------------------
-#if XERCES_HAVE_STDINT_H
-# include <stdint.h>
+#if XERCES_HAVE_INTTYPES_H
+# include <inttypes.h>
#endif
#if XERCES_HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -101,16 +101,6 @@
// XMLFilePos is the type used to represent a file position.
// ---------------------------------------------------------------------------
typedef XERCES_U32BIT_INT XMLFilePos;
-
-
-#define PROJ_XMLUTIL
-#define PROJ_XMLPARSER
-#define PROJ_SAX4C
-#define PROJ_SAX2
-#define PROJ_DOM
-#define PROJ_DEPRECATED_DOM
-#define PROJ_PARSERS
-#define PROJ_VALIDATORS
// ---------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
