Fixes for SGI builds (STR#2174)

   1) C++ style comments in C files converted to /* */
   2) #warning's had to be #ifdef'ed out (#if !defined(sgi)..)
With these mods, 1.3.x compiles on IRIX 6.5 with no failures.



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

3 files changed, 73 insertions, 71 deletions

diff --git a/FL/filename.H b/FL/filename.H
index 5806a55b2..965b68d95 100644
--- a/FL/filename.H
+++ b/FL/filename.H
@@ -33,7 +33,7 @@
 /** \addtogroup filenames File names and URI utility functions 
     @{ */
 
-#  define FL_PATH_MAX 256 ///< all path buffers should use this length
+#  define FL_PATH_MAX 256 /**< all path buffers should use this length */
 /** Gets the file name from a path. \return a pointer to the char after the last slash, or to \a filename if there is none. */
 FL_EXPORT const char *fl_filename_name(const char * filename);
 FL_EXPORT const char *fl_filename_ext(const char *);
@@ -105,7 +105,7 @@ FL_EXPORT int fl_casenumericsort(struct dirent **, struct dirent **);
 FL_EXPORT int fl_numericsort(struct dirent **, struct dirent **);
 #  endif
 
-  typedef int (Fl_File_Sort_F)(struct dirent **, struct dirent **); ///< File sorting function. \see fl_filename_list()
+  typedef int (Fl_File_Sort_F)(struct dirent **, struct dirent **); /**< File sorting function. \see fl_filename_list() */
 
 #  if defined(__cplusplus)
 }
diff --git a/FL/fl_types.h b/FL/fl_types.h
index bc7259a90..e88cc6318 100644
--- a/FL/fl_types.h
+++ b/FL/fl_types.h
@@ -1,29 +1,29 @@
-//
-// "$Id: fl_types.h 6299 2008-09-18 19:09:34Z fabien $"
-//
-// Simple "C"-style types for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2009 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 on the following page:
-//
-//     http://www.fltk.org/str.php
-//
+/*
+ * "$Id: fl_types.h 6299 2008-09-18 19:09:34Z fabien $"
+ *
+ * Simple "C"-style types for the Fast Light Tool Kit (FLTK).
+ *
+ * Copyright 1998-2009 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 on the following page:
+ *
+ *     http://www.fltk.org/str.php
+ */
 
 /** \file 
  *  This file contains simple "C"-style type definitions.
@@ -33,7 +33,7 @@
 #define FL_TYPES_H
 
 /** \name	Miscellaneous */
-/*@{*/	// group: Miscellaneous
+/*@{*/	/* group: Miscellaneous */
 
 /** unsigned char */
 typedef unsigned char uchar;
@@ -54,10 +54,10 @@ typedef const char *Fl_CString;
 /** 24-bit Unicode character + 8-bit indicator for keyboard flags */
 typedef unsigned int Fl_Unichar;
  
-/*@}*/	// group: Miscellaneous
+/*@}*/	/* group: Miscellaneous */
 
 #endif
 
-//
-// End of "$Id: fl_types.h 6299 2008-09-18 19:09:34Z fabien $".
-//
+/*
+ * End of "$Id: fl_types.h 6299 2008-09-18 19:09:34Z fabien $".
+ */
diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h
index 885d03ff2..f365de5be 100644
--- a/FL/fl_utf8.h
+++ b/FL/fl_utf8.h
@@ -1,31 +1,32 @@
-// "$Id: $"
-//
-// Author: Jean-Marc Lienher ( http://oksid.ch )
-// Copyright 2000-2009 by O'ksi'D.
-//
-// 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 on the following page:
-//
-//     http://www.fltk.org/str.php
-
-
-// Merged in some functionality from the fltk-2 version. IMM.
-// The following code is an attempt to merge the functions incorporated in FLTK2
-// with the functions provided in OksiD's fltk-1.1.6-utf8 port
+/* "$Id: $"
+ *
+ * Author: Jean-Marc Lienher ( http://oksid.ch )
+ * Copyright 2000-2009 by O'ksi'D.
+ *
+ * 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 on the following page:
+ *
+ *     http://www.fltk.org/str.php
+ */
+
+/* Merged in some functionality from the fltk-2 version. IMM.
+ * The following code is an attempt to merge the functions incorporated in FLTK2
+ * with the functions provided in OksiD's fltk-1.1.6-utf8 port
+ */
 
 /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
 
@@ -115,12 +116,12 @@ FL_EXPORT unsigned fl_utf8fromwc(char *dst, unsigned dstlen, const wchar_t *src,
 /* F2: Convert a UTF8 string into ASCII, eliding untranslatable glyphs */
 FL_EXPORT unsigned fl_utf8toa (const char *src, unsigned srclen, char *dst, unsigned dstlen);
 /* OD: convert UTF-8 string to latin1 */
-//FL_EXPORT int fl_utf2latin1(const unsigned char *src, int srclen, char *dst);
+/* FL_EXPORT int fl_utf2latin1(const unsigned char *src, int srclen, char *dst); */
 
 /* F2: Convert 8859-1 string to UTF8 */
 FL_EXPORT unsigned fl_utf8froma (char *dst, unsigned dstlen, const char *src, unsigned srclen);
 /* OD: convert latin1 str to UTF-8 */
-//FL_EXPORT int fl_latin12utf(const unsigned char *src, int srclen, char *dst);
+/* FL_EXPORT int fl_latin12utf(const unsigned char *src, int srclen, char *dst); */
 
 /* F2: Returns true if the current O/S locale is UTF8 */
 FL_EXPORT int fl_utf8locale();
@@ -141,7 +142,7 @@ FL_EXPORT char* fl_utf2mbcs(const char *src);
 /* F2: Convert a local multi-byte encoding to UTF8 - mainly for win32? */
 FL_EXPORT unsigned fl_utf8from_mb(char *dst, unsigned dstlen, const char *src, unsigned srclen);
 /* OD: Convert a local multi-byte encoding to UTF8 */
-//FL_EXPORT char* fl_mbcs2utf(const char *src);
+/* FL_EXPORT char* fl_mbcs2utf(const char *src); */
 
 /*****************************************************************************/
 #ifdef WIN32
@@ -152,9 +153,10 @@ FL_EXPORT char *fl_utf8_to_locale(const char *s, int len, unsigned int codepage)
 FL_EXPORT char *fl_locale_to_utf8(const char *s, int len, unsigned int codepage);
 #endif
 
-/*****************************************************************************/
-// The following functions are intended to provide portable, UTF8 aware
-// versions of standard functions
+/*****************************************************************************
+ * The following functions are intended to provide portable, UTF8 aware
+ * versions of standard functions
+ */
 
 /* OD: UTF8 aware strncasecmp - converts to lower case Unicode and tests */
 FL_EXPORT int fl_utf_strncasecmp(const char *s1, const char *s2, int n);
@@ -227,8 +229,8 @@ FL_EXPORT char fl_make_path( const char *path );
 #endif /* __cplusplus */
 
 
-#endif // _HAVE_FL_UTF8_HDR_
+#endif /* _HAVE_FL_UTF8_HDR_ */
 
-//
-// End of "$Id: $".
-//
+/*
+ * End of "$Id: $".
+ */