X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12ed6eb56f9bc229e6ed6ee5be8ba20840de4207..520e470fdd0daef09c77938db642e4583933c90d:/src/common/wxexpr.cpp?ds=inline

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 926cae3001..3d4979ef4c 100644
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -20,7 +20,15 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_IOSTREAMH
 #include <fstream.h>
+#else
+#include <fstream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+#endif
+
 #include <stdarg.h>
 #include <ctype.h>
 #include <string.h>
@@ -1230,7 +1238,7 @@ void process_command(char * cexpr)
   add_expr(expr);
 }
 
-void syntax_error(char *s)
+void syntax_error(char *WXUNUSED(s))
 {
   if (currentwxExprErrorHandler)
     (void)(*(currentwxExprErrorHandler))(WXEXPR_ERROR_SYNTAX, "syntax error");