One more Linux compile fix.

[simgear.git] / simgear / screen / extensions.cxx

diff --git a/simgear/screen/extensions.cxx b/simgear/screen/extensions.cxx
index aeab8998520201aa546ff1bf3a33a66a46270289..8ef03a6aa740ebe42b7cfe9db29488735a6cf440 100644 (file)
--- a/simgear/screen/extensions.cxx
+++ b/simgear/screen/extensions.cxx
@@ -22,21 +22,22 @@
  *
  */
 
-#include <string.h>
 
-#ifndef WIN32
-#include <dlfcn.h>
-#endif
+#include "extensions.hxx"
 
-#include <extensions.hxx>
+#include <cstring>
+#include <osg/GL> // for glGetString
 
-bool SGSearchExtensionsString(char *extString, char *extName) {
+bool SGSearchExtensionsString(const char *extString, const char *extName) {
     // Returns GL_TRUE if the *extName string appears in the *extString string,
     // surrounded by white spaces, or GL_FALSE otherwise.
 
-    char *p, *end;
+    const char *p, *end;
     int n, extNameLen;
 
+    if ((extString == NULL) || (extName == NULL))
+        return false;
+
     extNameLen = strlen(extName);
 
     p=extString;
@@ -53,14 +54,12 @@ bool SGSearchExtensionsString(char *extString, char *extName) {
     return GL_FALSE;
 }
 
-bool SGIsOpenGLExtensionSupported(char *extName) {
+bool SGIsOpenGLExtensionSupported(const char *extName) {
    // Returns GL_TRUE if the OpenGL Extension whose name is *extName
    // is supported by the system, or GL_FALSE otherwise.
    //
    // The *extName string must follow the OpenGL extensions naming scheme
    // (ie: "GL_type_extension", like GL_EXT_convolution)
 
-    return SGSearchExtensionsString((char *)glGetString(GL_EXTENSIONS),
-extName);
+    return SGSearchExtensionsString((const char *)glGetString(GL_EXTENSIONS),extName);
 }
-