Merge branch 'ehofman/particles'

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

diff --git a/simgear/screen/extensions.cxx b/simgear/screen/extensions.cxx
index ad406776e8040435d17dc948e3ee6f552e72a6df..130673c51f92c7654a1ba47c36b865a4ce14c3e5 100644 (file)
--- a/simgear/screen/extensions.cxx
+++ b/simgear/screen/extensions.cxx
@@ -56,7 +56,7 @@ bool SGSearchExtensionsString(const char *extString, const 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.
    //
@@ -121,11 +121,7 @@ void *SGGetGLProcAddress(const char *func) {
         libHandle = dlopen(NULL, RTLD_LAZY);
 
         if (!libHandle) {
-#if defined (__FreeBSD__)
             const char *error = dlerror();
-#else
-            char *error = dlerror();
-#endif
             if (error) {
                 SG_LOG(SG_GENERAL, SG_INFO, error);
                 return 0;
@@ -145,11 +141,7 @@ void *SGGetGLProcAddress(const char *func) {
     } else if (libHandle != NULL) {
         fptr = dlsym(libHandle, func);
 
-#if defined (__FreeBSD__)
         const char *error = dlerror();
-#else
-        char *error = dlerror();
-#endif
         if (error)
             SG_LOG(SG_GENERAL, SG_INFO, error);
     }