Fix portability problems with Solaris Forte C++ compiler.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2191 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 49 insertions, 49 deletions

diff --git a/FL/Fl_Export.H b/FL/Fl_Export.H
index 8c864a247..d6221d4aa 100644
--- a/FL/Fl_Export.H
+++ b/FL/Fl_Export.H
@@ -1,47 +1,47 @@
-//
-// "$Id: Fl_Export.H,v 1.3.2.2 2002/01/01 15:11:27 easysw Exp $"
-//
-// WIN32 DLL export definitions for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2002 by Bill Spitzak and others.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-//
-// Please report all bugs and problems to "fltk-bugs@fltk.org".
-//
+/*
+ * "$Id: Fl_Export.H,v 1.3.2.3 2002/05/03 20:30:19 easysw Exp $"
+ *
+ * WIN32 DLL export definitions for the Fast Light Tool Kit (FLTK).
+ *
+ * Copyright 1998-2002 by Bill Spitzak and others.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "fltk-bugs@fltk.org".
+ */
 
 #ifndef Fl_Export_H
-#define Fl_Export_H
+#  define Fl_Export_H
 
-//
-// The following is only used when building DLLs under WIN32 with Visual C++...
-//
+/*
+ * The following is only used when building DLLs under WIN32 with Visual C++...
+ */
 
-#if defined(FL_DLL) && defined(_MSC_VER)
-#  ifdef FL_LIBRARY
-#    define FL_EXPORT	__declspec(dllexport)
+#  if defined(FL_DLL) && defined(_MSC_VER)
+#    ifdef FL_LIBRARY
+#      define FL_EXPORT	__declspec(dllexport)
+#    else
+#      define FL_EXPORT	__declspec(dllimport)
+#    endif /* FL_LIBRARY */
 #  else
-#    define FL_EXPORT	__declspec(dllimport)
-#  endif /* FL_LIBRARY */
-#else
-#  define FL_EXPORT
-#endif /* FL_DLL && _MSC_VER */
+#    define FL_EXPORT
+#  endif /* FL_DLL && _MSC_VER */
 
-#endif // !Fl_Export_H
+#endif /* !Fl_Export_H */
 
-//
-// End of "$Id: Fl_Export.H,v 1.3.2.2 2002/01/01 15:11:27 easysw Exp $".
-//
+/*
+ * End of "$Id: Fl_Export.H,v 1.3.2.3 2002/05/03 20:30:19 easysw Exp $".
+ */
diff --git a/FL/Fl_Preferences.H b/FL/Fl_Preferences.H
index d42e9a72d..0c14f6337 100644
--- a/FL/Fl_Preferences.H
+++ b/FL/Fl_Preferences.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Preferences.H,v 1.1.2.5 2002/04/30 22:25:18 matthiaswm Exp $"
+// "$Id: Fl_Preferences.H,v 1.1.2.6 2002/05/03 20:30:19 easysw Exp $"
 //
 // Preferences definitions for the Fast Light Tool Kit (FLTK).
 //
@@ -45,7 +45,7 @@ public:
   typedef enum { SYSTEM=0, USER } Root;
   // typedef enum { win32, macos, fltk } Type;
 
-  FL_EXPORT Fl_Preferences( enum Root root, const char *vendor, const char *application );
+  FL_EXPORT Fl_Preferences( Root root, const char *vendor, const char *application );
   FL_EXPORT Fl_Preferences( Fl_Preferences&, const char *group );
   FL_EXPORT Fl_Preferences( Fl_Preferences*, const char *group );
   FL_EXPORT ~Fl_Preferences();
@@ -81,7 +81,7 @@ public:
 
   FL_EXPORT void flush();
 
-  // FL_EXPORT char export( const char *filename, enum Type fileFormat );
+  // FL_EXPORT char export( const char *filename, Type fileFormat );
   // FL_EXPORT char import( const char *filename );
 
   class Name {
@@ -93,15 +93,15 @@ public:
     FL_EXPORT ~Name();
   };
 
-private:
-
-  static char nameBuffer[128];
-
   struct Entry
   {
     char *name, *value;
   };
 
+private:
+
+  static char nameBuffer[128];
+
   class Node // a node contains a list to all its entries 
   {          // and all means to manage the tree structure
     Node *child_, *next_, *parent_;
@@ -140,7 +140,7 @@ private:
     char *filename_;
     char *vendor_, *application_;
   public:
-    RootNode( Fl_Preferences *, enum Root root, const char *vendor, const char *application );
+    RootNode( Fl_Preferences *, Root root, const char *vendor, const char *application );
     ~RootNode();
     int read();
     int write();
@@ -157,5 +157,5 @@ private:
 #endif // !Fl_Preferences_H
 
 //
-// End of "$Id: Fl_Preferences.H,v 1.1.2.5 2002/04/30 22:25:18 matthiaswm Exp $".
+// End of "$Id: Fl_Preferences.H,v 1.1.2.6 2002/05/03 20:30:19 easysw Exp $".
 //