diff options
Diffstat (limited to 'src/common/solaris')
| -rw-r--r-- | src/common/solaris/dump_symbols.cc | 2 | ||||
| -rw-r--r-- | src/common/solaris/guid_creator.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/common/solaris/dump_symbols.cc b/src/common/solaris/dump_symbols.cc index fb040265..168d0b28 100644 --- a/src/common/solaris/dump_symbols.cc +++ b/src/common/solaris/dump_symbols.cc @@ -156,7 +156,7 @@ const char *kStrtabName = ".strtab"; const int demangleLen = 20000; // Offset to the string table. -u_int64_t stringOffset = 0; +uint64_t stringOffset = 0; // Update the offset to the start of the string index of the next // object module for every N_ENDM stabs. diff --git a/src/common/solaris/guid_creator.cc b/src/common/solaris/guid_creator.cc index 70940259..c4d58e0a 100644 --- a/src/common/solaris/guid_creator.cc +++ b/src/common/solaris/guid_creator.cc @@ -53,10 +53,10 @@ class GUIDGenerator { bool CreateGUID(GUID *guid) const { guid->data1 = random(); - guid->data2 = (u_int16_t)(random()); - guid->data3 = (u_int16_t)(random()); - *reinterpret_cast<u_int32_t*>(&guid->data4[0]) = random(); - *reinterpret_cast<u_int32_t*>(&guid->data4[4]) = random(); + guid->data2 = (uint16_t)(random()); + guid->data3 = (uint16_t)(random()); + *reinterpret_cast<uint32_t*>(&guid->data4[0]) = random(); + *reinterpret_cast<uint32_t*>(&guid->data4[4]) = random(); return true; } }; @@ -74,8 +74,8 @@ bool GUIDToString(const GUID *guid, char *buf, int buf_len) { assert(buf_len > kGUIDStringLength); int num = snprintf(buf, buf_len, kGUIDFormatString, guid->data1, guid->data2, guid->data3, - *reinterpret_cast<const u_int32_t *>(&(guid->data4[0])), - *reinterpret_cast<const u_int32_t *>(&(guid->data4[4]))); + *reinterpret_cast<const uint32_t *>(&(guid->data4[0])), + *reinterpret_cast<const uint32_t *>(&(guid->data4[4]))); if (num != kGUIDStringLength) return false; |