sun compilation fix

[wxWidgets.git] / src / common / wxexpr.cpp

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 926cae30013f5f40888956fab62d06c1343a340a..5a3ace2c1477cfdf3f597d120303c3ab108d00ff 100644 (file)
--- 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>
@@ -34,11 +42,10 @@ extern "C" void add_expr(char *);
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);
 
+
 wxExprDatabase *thewxExprDatabase = NULL;
 wxExprErrorHandler currentwxExprErrorHandler;
 
-IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
-
 wxExpr::wxExpr(const wxString& functor)
 {
   type = wxExprList;
@@ -843,7 +850,14 @@ void wxExpr::WriteLispExpr(ostream& stream)
   }
 }
 
-// wxExpr 'database' (list of expressions)
+/*
+ * wxExpr 'database' (list of expressions)
+ */
+ 
+#if !USE_SHARED_LIBRARIES
+IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
+#endif
+
 wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
 {
   position = NULL;
@@ -1124,14 +1138,14 @@ bool wxExprIsFunctor(wxExpr *expr, const wxString& functor)
  *
  */
 
-char *make_integer(char *str)
+char *wxmake_integer(char *str)
 {
   wxExpr *x = new wxExpr(atol(str));
 
   return (char *)x;
 }
 
-char *make_real(char *str1, char *str2)
+char *wxmake_real(char *str1, char *str2)
 {
   char buf[50];
 
@@ -1144,7 +1158,7 @@ char *make_real(char *str1, char *str2)
 
 // extern "C" double exp10(double);
 
-char *make_exp(char *str1, char *str2)
+char *wxmake_exp(char *str1, char *str2)
 {
   double mantissa = (double)atoi(str1);
   double exponent = (double)atoi(str2);
@@ -1156,7 +1170,7 @@ char *make_exp(char *str1, char *str2)
   return (char *)x;
 }
 
-char *make_exp2(char *str1, char *str2, char *str3)
+char *wxmake_exp2(char *str1, char *str2, char *str3)
 {
   char buf[50];
 
@@ -1171,13 +1185,13 @@ char *make_exp2(char *str1, char *str2, char *str3)
   return (char *)x;
 }
 
-char *make_word(char *str)
+char *wxmake_word(char *str)
 {
   wxExpr *x = new wxExpr(wxExprWord, str);
   return (char *)x;
 }
 
-char *make_string(char *str)
+char *wxmake_string(char *str)
 {
   char *s, *t;
   int len, i;
@@ -1230,7 +1244,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");