Removing an extraneous "#if TARGET_HOST_POSIX_X11" and putting the path into the...

[freeglut] / src / x11 / freeglut_window_x11.c

diff --git a/src/x11/freeglut_window_x11.c b/src/x11/freeglut_window_x11.c
index cf48711..f810965 100644 (file)
--- a/src/x11/freeglut_window_x11.c
+++ b/src/x11/freeglut_window_x11.c
@@ -30,7 +30,7 @@
 #include <GL/freeglut.h>\r
 #include <limits.h>  /* LONG_MAX */\r
 #include <unistd.h>  /* usleep */\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 /* pushing attribute/value pairs into an array */\r
 #define ATTRIB(a) attributes[where++]=(a)\r
@@ -86,7 +86,7 @@
  * Chooses a visual basing on the current display mode settings\r
  */\r
 \r
-GLXFBConfig* fgChooseFBConfig( int *numcfgs )\r
+GLXFBConfig* fgPlatformChooseFBConfig( int *numcfgs )\r
 {\r
   GLboolean wantIndexedMode = GL_FALSE;\r
   int attributes[ 100 ];\r
@@ -451,7 +451,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )\r
         fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;\r
 \r
-    window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );\r
+    window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );\r
 \r
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )\r
         fgState.DisplayMode = current_DisplayMode ;\r
@@ -459,21 +459,21 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     if( ! window->Window.pContext.FBConfig )\r
     {\r
         /*\r
-         * The "fgChooseFBConfig" returned a null meaning that the visual\r
+         * The "fgPlatformChooseFBConfig" returned a null meaning that the visual\r
          * context is not available.\r
          * Try a couple of variations to see if they will work.\r
          */\r
         if( !( fgState.DisplayMode & GLUT_DOUBLE ) )\r
         {\r
             fgState.DisplayMode |= GLUT_DOUBLE ;\r
-            window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );\r
+            window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );\r
             fgState.DisplayMode &= ~GLUT_DOUBLE;\r
         }\r
 \r
         if( fgState.DisplayMode & GLUT_MULTISAMPLE )\r
         {\r
             fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;\r
-            window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );\r
+            window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );\r
             fgState.DisplayMode |= GLUT_MULTISAMPLE;\r
         }\r
     }\r