summaryrefslogtreecommitdiff
path: root/src/glut_font.cxx
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2009-03-14 02:11:31 +0000
committerGreg Ercolano <erco@seriss.com>2009-03-14 02:11:31 +0000
commit50a92455febba116be7a9d1bbeb46d4f2f6a6143 (patch)
treec7357ac35bd1173623329d0fd87aa5c76b3295f1 /src/glut_font.cxx
parent923479622ffce8a2db0807c16437f4e66e53cbb7 (diff)
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
Diffstat (limited to 'src/glut_font.cxx')
-rw-r--r--src/glut_font.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glut_font.cxx b/src/glut_font.cxx
index 826c240f3..a1c3c3a36 100644
--- a/src/glut_font.cxx
+++ b/src/glut_font.cxx
@@ -114,7 +114,7 @@ void glutStrokeString(void* fontID, const unsigned char *string) {
* A newline will simply translate the next character's insertion
* point back to the start of the line and down one line.
*/
-#if !defined(WIN32) || defined(CYGWIN)
+#if !defined(WIN32) && !defined(sgi) || defined(CYGWIN)
#warning FIXME This needs to be UTF aware now
#endif