From 6d38ea155cddf9b27bfb3e14a22e0c46766bf776 Mon Sep 17 00:00:00 2001
From: sandalle <sandalle@7f0cb862-5218-0410-a997-914c9d46530a>
Date: Fri, 1 Aug 2003 15:45:56 +0000
Subject: [PATCH] src/freeglut_initial.c:91  Added check for SOLARIS OS

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@148 7f0cb862-5218-0410-a997-914c9d46530a
---
 freeglut/freeglut/ChangeLog               | 7 +++++++
 freeglut/freeglut/src/freeglut_internal.h | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/freeglut/freeglut/ChangeLog b/freeglut/freeglut/ChangeLog
index 0f1dc03..646a503 100644
--- a/freeglut/freeglut/ChangeLog
+++ b/freeglut/freeglut/ChangeLog
@@ -247,3 +247,10 @@ October 24, 2002:
 (93) doc/Makefile.am:4  Removed trailing backslash and added an empty last line
 
 (94) src/freeglut_window.c  Windowing fixes from John F.
+
+
+*******************************************************************************************
+* Changes on 23 July 2003
+*******************************************************************************************
+
+(95) src/freeglut_initial.c:91  Added check for SOLARIS OS
diff --git a/freeglut/freeglut/src/freeglut_internal.h b/freeglut/freeglut/src/freeglut_internal.h
index 4564157..796a7d7 100644
--- a/freeglut/freeglut/src/freeglut_internal.h
+++ b/freeglut/freeglut/src/freeglut_internal.h
@@ -90,7 +90,9 @@
     #include <X11/keysym.h>
 
     #ifndef __sgi
-    #include <X11/extensions/xf86vmode.h>
+      #ifndef SOLARIS
+        #include <X11/extensions/xf86vmode.h>
+      #endif
     #endif
 #endif