diff -Nruap src.org/staptree.cxx src/staptree.cxx --- src.org/staptree.cxx 2005-12-05 03:38:54.000000000 +0800 +++ src/staptree.cxx 2005-12-05 03:39:19.000000000 +0800 @@ -15,7 +15,15 @@ #include using namespace std; - +#if __WORDSIZE == 64 + #ifdef __x86_64__ + #define PRi64 "ll" + #else + #define PRi64 "l" + #endif +#else + #define PRi64 "ll" +#endif expression::expression (): type (pe_unknown), tok (0) @@ -367,23 +375,23 @@ print_format::components_to_string(vecto switch (i->type) { case conv_signed_decimal: - oss << "lld"; + oss << PRi64"d"; break; case conv_unsigned_decimal: - oss << "llu"; + oss << PRi64"u"; break; case conv_unsigned_octal: - oss << "llo"; + oss << PRi64"o"; break; case conv_unsigned_uppercase_hex: - oss << "llX"; + oss << PRi64"X"; break; case conv_unsigned_lowercase_hex: - oss << "llx"; + oss << PRi64"x"; break; case conv_string: