corrected conflicts after import of libpng-1.2.4

[wxWidgets.git] / include / wx / wx_cw_d.h

diff --git a/include/wx/wx_cw_d.h b/include/wx/wx_cw_d.h
index f56d8cdc0ab5ab2c4352260a552fdad03b68071b..94d5dd1741efa3a2af319f1584a219b8cef1c07e 100644 (file)
--- a/include/wx/wx_cw_d.h
+++ b/include/wx/wx_cw_d.h
@@ -12,6 +12,13 @@
 #ifndef _WX_CW__
 #define _WX_CW__
 
+#if __MWERKS__ >= 0x2400
+#pragma old_argmatch on
+#endif
+
+#if __option(profile)
+#error "profiling is not supported in debug versions"
+#else
 #ifdef __cplusplus
        #if __POWERPC__
                #include <wx_PPC++_d.mch>
@@ -33,6 +40,7 @@
                #include <wx_68k_d.mch>
        #endif
 #endif
+#endif
 
 #endif
     // _WX_CW__