Get rid of obsoleted XP_MAC checks. [p=reed r+a1.9=stuart]
authorreed@reedloden.com
Thu, 24 Jan 2008 23:15:32 -0800
changeset 10646 927f90612dd7b4541945d11bf9c29ba19db7b2c1
parent 10645 91e240622bc852ecc9f8936388087b5bb9c62eb7
child 10647 7700a6167ba23b5dd2346d4c5ae04413e406da4d
push idunknown
push userunknown
push dateunknown
milestone1.9b3pre
Get rid of obsoleted XP_MAC checks. [p=reed r+a1.9=stuart]
jpeg/jconfig.h
jpeg/jdapimin.c
jpeg/jmorecfg.h
--- a/jpeg/jconfig.h
+++ b/jpeg/jconfig.h
@@ -69,23 +69,16 @@
 
 #ifdef JPEG_INTERNALS
 
 /* If right shift of "long" quantities is unsigned on your machine,
  * you'll have to define this.  Fortunately few people should need it.
  */
 #undef RIGHT_SHIFT_IS_UNSIGNED
 
-#ifdef XP_MAC                   /* Macintosh */
-
-#define ALIGN_TYPE long         /* for sane memory alignment */
-#define NO_GETENV               /* we do have the function, but it's dead */
-
-#endif /* XP_MAC */
-
 #endif /* JPEG_INTERNALS */
 
 
 /* these defines are not interesting for building just the IJG library,
  * but we leave 'em here anyway.
  */
 #ifdef JPEG_CJPEG_DJPEG
 
--- a/jpeg/jdapimin.c
+++ b/jpeg/jdapimin.c
@@ -468,19 +468,19 @@ static int sse2support()
 #else
 #ifdef HAVE_SSE2_INTRINSICS
 static int sse2supportGCC()
 {
 
   /* Mac Intel started with Core Duo chips which have SSE2 Support */
 
 #if defined(__GNUC__) && defined(__i386__)
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#if defined(XP_MACOSX)
   return 1;
-#endif ! XP_MAC || XP_MACOSX
+#endif ! XP_MACOSX
 #endif ! GNUC && i386
 
   /* Add checking for SSE2 support for other platforms here */
 
   /* We don't have SSE2 intrinsics support */
 
   return 2;
 }
--- a/jpeg/jmorecfg.h
+++ b/jpeg/jmorecfg.h
@@ -111,19 +111,19 @@ typedef short JCOEF;
 #define HAVE_MMX_INTEL_MNEMONICS 
 
 /* SSE2 code appears broken for some cpus (bug 247437) */
 #define HAVE_SSE2_INTEL_MNEMONICS
 #define HAVE_SSE2_INTRINSICS
 #endif
 
 #if defined(__GNUC__) && defined(__i386__)
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#if defined(XP_MACOSX)
 #define HAVE_SSE2_INTRINSICS
-#endif ! XP_MAC || XP_MACOSX
+#endif ! XP_MACOSX
 #endif ! GNUC && i386
 
 /* Add support for other platforms here */
 
 
 /* Compressed datastreams are represented as arrays of JOCTET.
  * These must be EXACTLY 8 bits wide, at least once they are written to
  * external storage.  Note that when using the stdio data source/destination