X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a11869dde55ba034e280fd7a764872c8de642cf..4259a48e0b5799e015061f8e649ab54ad2d9dc7f:/include/wx/wxexpr.h diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h index f756261663..a07e6f3171 100644 --- a/include/wx/wxexpr.h +++ b/include/wx/wxexpr.h @@ -21,10 +21,13 @@ #include "wx/defs.h" #include "wx/string.h" -#if USE_IOSTREAMH +#if wxUSE_IOSTREAMH #include #else #include +# ifdef _MSC_VER + using namespace std; +# endif #endif #include "wx/list.h" @@ -275,7 +278,7 @@ bool WXDLLEXPORT wxExprIsFunctor(wxExpr *expr, const wxString& functor); WXDLLEXPORT_DATA(extern wxExprDatabase*) thewxExprDatabase; // YACC/LEX can leave memory lying around... -extern "C" WXDLLEXPORT wxExprCleanUp(); +extern "C" int WXDLLEXPORT wxExprCleanUp(); #endif