Index: ossp-pkg/xds/configure.ac RCS File: /v/ossp/cvs/ossp-pkg/xds/configure.ac,v rcsdiff -q -kk '-r1.10' '-r1.11' -u '/v/ossp/cvs/ossp-pkg/xds/configure.ac,v' 2>/dev/null --- configure.ac 2001/08/02 14:18:30 1.10 +++ configure.ac 2001/08/02 14:39:15 1.11 @@ -23,42 +23,44 @@ dnl AC_CHECK_TYPE(u_int8_t, [xds_uint8_t=u_int8_t], [AC_CHECK_TYPE(uint8_t, [xds_uint8_t=uint8_t], - [AC_MSG_ERROR([no unsigned 8 bit data type found])] - )]) -AC_SUBST([xds_uint8_t]) + [AC_MSG_ERROR([no unsigned 8 bit data type found])])]) AC_CHECK_TYPE(u_int16_t, [xds_uint16_t=u_int16_t], [AC_CHECK_TYPE(uint16_t, [xds_uint16_t=uint16_t], - [AC_MSG_ERROR([no unsigned 16 bit data type found])] - )]) -AC_SUBST([xds_uint16_t]) + [AC_MSG_ERROR([no unsigned 16 bit data type found])])]) AC_CHECK_TYPE(u_int32_t, [xds_uint32_t=u_int32_t], [AC_CHECK_TYPE(uint32_t, [xds_uint32_t=uint32_t], - [AC_MSG_ERROR([no unsigned 32 bit data type found])] - )]) -AC_SUBST([xds_uint32_t]) + [AC_MSG_ERROR([no unsigned 32 bit data type found])])]) AC_CHECK_TYPE(u_int64_t, [xds_uint64_t=u_int64_t], [AC_CHECK_TYPE(uint64_t, [xds_uint64_t=uint64_t], - [AC_MSG_ERROR([no unsigned 64 bit data type found]) - ])]) -AC_SUBST([xds_uint64_t]) + [AC_MSG_WARN([no unsigned 64 bit data type found]) + xds_uint64_t=undefined])]) dnl AC_CHECK_TYPE(int8_t, [xds_int8_t=int8_t], [AC_MSG_ERROR([no signed 8 bit data type found]) ]) -AC_SUBST([xds_int8_t]) AC_CHECK_TYPE(int16_t, [xds_int16_t=int16_t], [AC_MSG_ERROR([no signed 16 bit data type found]) ]) -AC_SUBST([xds_int16_t]) AC_CHECK_TYPE(int32_t, [xds_int32_t=int32_t], [AC_MSG_ERROR([no signed 32 bit data type found]) ]) -AC_SUBST([xds_int32_t]) AC_CHECK_TYPE(int64_t, [xds_int64_t=int64_t], - [AC_MSG_ERROR([no signed 64 bit data type found]) - ]) -AC_SUBST([xds_int64_t]) + [AC_MSG_WARN([no signed 64 bit data type found]) + xds_int64_t=undefined]) dnl +if test "$xds_int64_t" = "undefined" -o "$xds_uint64_t" = "undefined"; then + have_64_bit_support="#undef XDS_HAVE_64_BIT_SUPPORT" +else + have_64_bit_support="#define XDS_HAVE_64_BIT_SUPPORT" +fi +AC_SUBST([xds_uint8_t]) +AC_SUBST([xds_uint16_t]) +AC_SUBST([xds_uint32_t]) +AC_SUBST([xds_uint64_t]) +AC_SUBST([xds_int8_t]) +AC_SUBST([xds_int16_t]) +AC_SUBST([xds_int32_t]) +AC_SUBST([xds_int64_t]) AC_SUBST([have_64_bit_support]) dnl Find the library containing the xdr_xxx() functions. Index: ossp-pkg/xds/xds.h.in RCS File: /v/ossp/cvs/ossp-pkg/xds/xds.h.in,v rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/xds/xds.h.in,v' 2>/dev/null --- xds.h.in 2001/08/02 08:12:26 1.8 +++ xds.h.in 2001/08/02 14:39:15 1.9 @@ -38,14 +38,18 @@ #define XDS_TRUE (1==1) #define XDS_FALSE (1!=1) +@have_64_bit_support@ + typedef @xds_uint8_t@ xds_uint8_t; -typedef @xds_uint16_t@ xds_uint16_t; -typedef @xds_uint32_t@ xds_uint32_t; -typedef @xds_uint64_t@ xds_uint64_t; typedef @xds_int8_t@ xds_int8_t; +typedef @xds_uint16_t@ xds_uint16_t; typedef @xds_int16_t@ xds_int16_t; +typedef @xds_uint32_t@ xds_uint32_t; typedef @xds_int32_t@ xds_int32_t; +#ifdef XDS_HAVE_64_BIT_SUPPORT +typedef @xds_uint64_t@ xds_uint64_t; typedef @xds_int64_t@ xds_int64_t; +#endif typedef double xds_double_t; enum @@ -126,10 +130,12 @@ xds_declare_formatting_engine(xdr_decode_uint32); xds_declare_formatting_engine(xdr_encode_int32); xds_declare_formatting_engine(xdr_decode_int32); +#ifdef XDS_HAVE_64_BIT_SUPPORT xds_declare_formatting_engine(xdr_encode_uint64); xds_declare_formatting_engine(xdr_decode_uint64); xds_declare_formatting_engine(xdr_encode_int64); xds_declare_formatting_engine(xdr_decode_int64); +#endif xds_declare_formatting_engine(xdr_encode_double); xds_declare_formatting_engine(xdr_decode_double); xds_declare_formatting_engine(xdr_encode_octetstream); @@ -145,10 +151,12 @@ xds_declare_formatting_engine(xml_decode_uint32); xds_declare_formatting_engine(xml_encode_int32); xds_declare_formatting_engine(xml_decode_int32); +#ifdef XDS_HAVE_64_BIT_SUPPORT xds_declare_formatting_engine(xml_encode_uint64); xds_declare_formatting_engine(xml_decode_uint64); xds_declare_formatting_engine(xml_encode_int64); xds_declare_formatting_engine(xml_decode_int64); +#endif xds_declare_formatting_engine(xml_encode_double); xds_declare_formatting_engine(xml_decode_double); xds_declare_formatting_engine(xml_encode_octetstream);