Addition Irix tweaks.

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 7c62c3f562ac3f24bcd8428a36314a76fe620f3d..74078a6e2bee1b6c988878ca5a7101e3ba59bcbf 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -167,7 +167,7 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable)
     string msg = txt;
     msg += '\n';
     msg += throwable.getFormattedMessage();
-    if (throwable.getOrigin() != "") {
+    if (throwable.getOrigin() != (string)"") {
       msg += "\n (reported by ";
       msg += throwable.getOrigin();
       msg += ')';

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 0a841f6da82c6096b630f7c5f6529865885b4ade..8395f0320cf6006d293f4e6693da453f15db397b 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -113,8 +113,10 @@
 // Should already be inlcluded by gl.h if needed by your platform so
 // we shouldn't include this here.
 // #include <GL/glext.h>
+#if !defined(sgi)
 // PFNGLPOINTPARAMETERFEXTPROC glPointParameterfEXT = 0;
 // PFNGLPOINTPARAMETERFVEXTPROC glPointParameterfvEXT = 0;
+#endif
 float default_attenuation[3] = {1.0, 0.0, 0.0};
 //Required for using GL_extensions
 void fgLoadDCS (void);
@@ -806,10 +808,12 @@ void fgRenderFrame( void ) {
             glEnable(GL_POINT_SMOOTH);
             float quadratic[3] = {1.0, 0.01, 0.0001};
             // get the address of our OpenGL extensions
+#if !defined(sgi)
             glPointParameterfEXT = (PFNGLPOINTPARAMETERFEXTPROC) 
                 wglGetProcAddress("glPointParameterfEXT");
             glPointParameterfvEXT = (PFNGLPOINTPARAMETERFVEXTPROC) 
                 wglGetProcAddress("glPointParameterfvEXT");
+#endif
             // makes the points fade as they move away
             glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quadratic);
             glPointParameterfEXT(GL_POINT_SIZE_MIN_EXT, 1.0); 

diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx
index f2c237fff2060f7d83a0a45d56f88361b24e3588..30354ada17e873ff1a0cdd54ba86f42ab236fae8 100644 (file)
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -166,7 +166,7 @@ void HttpdChannel::foundTerminator (void) {
                 if ( child->nChildren() > 0 ) {
                     line += "<B><A HREF=\"";
                     line += request;
-                    if ( request.substr(request.length() - 1, 1) != "/" ) {
+                    if ( request.substr(request.length() - 1, 1) != (string)"/" ) {
                         line += "/";
                     }
                     line += name;
@@ -180,7 +180,7 @@ void HttpdChannel::foundTerminator (void) {
                     line += name;
                     line += "</B> <A HREF=\"";
                     line += request;
-                    if ( request.substr(request.length() - 1, 1) != "/" ) {
+                    if ( request.substr(request.length() - 1, 1) != (string)"/" ) {
                         line += "/";
                     }
                     line += name;