From 28b4db7f890258e83fa0a57ea85c72585e48b756 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 Jul 2003 22:53:49 +0000
Subject: [PATCH] ugly fix for warnings when wxUSE_STL==0 not breaking
 compilation when wxUSE_STL==1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/dcbase.cpp | 6 +++++-
 src/html/htmlpars.cpp | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 8534732e7b..77b09b154b 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -290,7 +290,11 @@ void wxDCBase::DoDrawSpline( wxList *points )
 
     wx_spline_add_point(x1, y1);
 
-    while ((node = node->GetNext()))
+    while ((node = node->GetNext())
+#if !wxUSE_STL
+           != NULL
+#endif // !wxUSE_STL
+          )
     {
         p = (wxPoint *)node->GetData();
         x1 = x2;
diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index bb209217f7..3a409efb3b 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -375,7 +375,12 @@ void wxHtmlParser::PopTagHandler()
     wxList::compatibility_iterator first;
 
     if ( !m_HandlersStack ||
-         !(first = m_HandlersStack->GetFirst()) )
+#if wxUSE_STL
+         !(first = m_HandlersStack->GetFirst())
+#else // !wxUSE_STL
+         ((first = m_HandlersStack->GetFirst()) == NULL)
+#endif // wxUSE_STL/!wxUSE_STL
+        )
     {
         wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
         return;
-- 
2.45.2