X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17e48bcebf8f65df995d2bed81f73dcdf532f8eb..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/cppunit.h diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index d320acdc71..f6aee85817 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -200,10 +200,14 @@ WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long) -#if defined(wxLongLong_t) && !defined(wxLongLongIsLong) +#if defined( __VMS ) && defined( __ia64 ) +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::basic_streambuf::pos_type); +#endif + +#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t) -#endif +#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG // Use this macro to compare a wxArrayString with the pipe-separated elements // of the given string