TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

flt: fix compile error on macOS 10.6 (which has no strnlen)

Browse Source
This commit is contained in:
rdb 2018-04-10 15:29:43 +02:00
parent 9ca0d089a6
commit 607af9ff49
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandatool/src/flt/fltBeadID.cxx
View File

@ -78,8 +78,8 @@ extract_record(FltRecordReader &reader) {
bool FltBeadID:: bool FltBeadID::
extract_ancillary(FltRecordReader &reader) { extract_ancillary(FltRecordReader &reader) {
if (reader.get_opcode() == FO_long_id) { if (reader.get_opcode() == FO_long_id) {
vector_uchar s = reader.get_iterator().get_remaining_bytes(); DatagramIterator &di = reader.get_iterator();
_id.assign((const char *)s.data(), strnlen((const char *)s.data(), s.size())); _id = di.get_fixed_string(di.get_remaining_size());
return true; return true;
} }

4
pandatool/src/flt/fltRecord.cxx
View File

@ -621,8 +621,8 @@ extract_record(FltRecordReader &) {
bool FltRecord:: bool FltRecord::
extract_ancillary(FltRecordReader &reader) { extract_ancillary(FltRecordReader &reader) {
if (reader.get_opcode() == FO_comment) { if (reader.get_opcode() == FO_comment) {
vector_uchar s = reader.get_iterator().get_remaining_bytes(); DatagramIterator &di = reader.get_iterator();
_comment.assign((const char *)s.data(), strnlen((const char *)s.data(), s.size())); _comment = di.get_fixed_string(di.get_remaining_size());
return true; return true;
} }