X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/409e38cd653526e81b4d7fc63c0d68d4c1258809..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/debug.h?ds=sidebyside diff --git a/include/wx/debug.h b/include/wx/debug.h index 49a15d363b..2a8a9b44bc 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -6,13 +6,15 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DEBUG_H_ #define _WX_DEBUG_H_ +#ifndef __WXWINCE__ #include +#endif #include // for CHAR_BIT used below #include "wx/wxchar.h" // for __TFILE__ and wxChar @@ -180,12 +182,17 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse; result in a warning about unused variable) and a named struct (otherwise we'd get a warning about an unnamed struct not used to define an object!). The _n__ part is to stop VC++ 7 being confused since it encloses __LINE++ in - parentheses. + parentheses. Unfortunately this does not work with other compilers, so + we will only enable it when we know the _precise_ symbols to test for. */ #define wxMAKE_ASSERT_NAME_HELPER(line) wxAssert_ ## line #define wxMAKE_ASSERT_NAME(line) wxMAKE_ASSERT_NAME_HELPER(line) +#if 0 #define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_ASSERT_NAME(_n___ ## __LINE__) +#else +#define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_ASSERT_NAME(__LINE__) +#endif #define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxMAKE_ASSERT_NAME(text) /*