[Mesa-dev] [PATCH 4/5] mesa: remove macintosh preprocessor stuff

[Brian Paul]

IIRC, this is MacOS 9.x stuff.
---
 include/GL/gl.h            |    7 -------
 src/mesa/math/m_clip_tmp.h |   12 ++++++------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 31a2813..1d21df7 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -88,10 +88,6 @@
 #include <windows.h>
 #endif
 
-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
-#pragma import on
-#endif
-
 #ifndef GLAPI
 #define GLAPI extern
 #endif
@@ -2169,9 +2165,6 @@ typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t
 #pragma export off
 #endif
 
-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
-#pragma import off
-#endif
 /*
  * End system-specific stuff
  **********************************************************************/
diff --git a/src/mesa/math/m_clip_tmp.h b/src/mesa/math/m_clip_tmp.h
index 5cfcf91..45dec47 100644
--- a/src/mesa/math/m_clip_tmp.h
+++ b/src/mesa/math/m_clip_tmp.h
@@ -60,7 +60,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec,
       const GLfloat cy = from[1];
       const GLfloat cz = from[2];
       const GLfloat cw = from[3];
-#if defined(macintosh) || defined(__powerpc__)
+#if defined(__powerpc__)
       /* on powerpc cliptest is 17% faster in this way. */
       GLuint mask;
       mask = (((cw < cx) << CLIP_RIGHT_SHIFT));
@@ -71,7 +71,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec,
 	 mask |= (((cw < cz) << CLIP_FAR_SHIFT));
 	 mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
       }
-#else /* !defined(macintosh)) */
+#else
       GLubyte mask = 0;
       if (-cx + cw < 0) mask |= CLIP_RIGHT_BIT;
       if ( cx + cw < 0) mask |= CLIP_LEFT_BIT;
@@ -81,7 +81,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec,
 	 if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
 	 if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
       }
-#endif /* defined(macintosh) */
+#endif
 
       clipMask[i] = mask;
       if (mask) {
@@ -140,7 +140,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
       const GLfloat cy = from[1];
       const GLfloat cz = from[2];
       const GLfloat cw = from[3];
-#if defined(macintosh) || defined(__powerpc__)
+#if defined(__powerpc__)
       /* on powerpc cliptest is 17% faster in this way. */
       GLuint mask;
       mask = (((cw < cx) << CLIP_RIGHT_SHIFT));
@@ -151,7 +151,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
 	 mask |= (((cw < cz) << CLIP_FAR_SHIFT));
 	 mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
       }
-#else /* !defined(macintosh)) */
+#else
       GLubyte mask = 0;
       if (-cx + cw < 0) mask |= CLIP_RIGHT_BIT;
       if ( cx + cw < 0) mask |= CLIP_LEFT_BIT;
@@ -161,7 +161,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
 	 if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
 	 if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
       }
-#endif /* defined(macintosh) */
+#endif
 
       clipMask[i] = mask;
       if (mask) {
-- 
1.7.10.4