Some BC++ fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/tex2rtf/src/table.cpp b/utils/tex2rtf/src/table.cpp
index 4dc88ee028e41d4f9c6ff15afbf590297ae21e7b..bf51891a8f922d89cfe7716d271c1ec4486452f0 100644 (file)
--- a/utils/tex2rtf/src/table.cpp
+++ b/utils/tex2rtf/src/table.cpp
@@ -27,6 +27,10 @@
 
 #include <wx/hash.h>
 
 
 #include <wx/hash.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index ac68e432118beabe56d51b91fc9e28dab96ef48d..ad52f44ef070d201c2af88d949aa15e221cd31a5 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -26,6 +26,10 @@
 
 #include <wx/hash.h>
 
 
 #include <wx/hash.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>