X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a54b285e7c829b885f78d4b8a96dd2e169a693d7..b5fe7ca67bf3121959a0b5a59afd00c1708f2f03:/tests/streams/bstream.h?ds=sidebyside diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h index 3f5e1f1d59..7304133977 100644 --- a/tests/streams/bstream.h +++ b/tests/streams/bstream.h @@ -28,6 +28,11 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \ STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name ) +// under 64 bit platforms wxFileOffset is the same as long and we already have +// WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long) in wx/cppunit.h +#if SIZEOF_LONG != 8 +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxFileOffset) +#endif /////////////////////////////////////////////////////////////////////////////// // Template class that implements a test for all base stream functions. @@ -375,7 +380,7 @@ protected: const char *buf = "1234567890"; (void)stream_out.Write(buf, 10); - off_t pos = stream_out.SeekO(5, wxFromStart); + wxFileOffset pos = stream_out.SeekO(5, wxFromStart); CPPUNIT_ASSERT_EQUAL(pos, stream_out.TellO()); (void)stream_out.PutC('1'); CPPUNIT_ASSERT_EQUAL(6, stream_out.TellO());