From 8f618d7caec46854827f20288b0e2cb59119adf4 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <reed@reedloden.com>
Date: Wed, 13 Feb 2008 02:34:01 -0800
Subject: [PATCH] Bug 416906 - "Incorrect preprocessor syntax" (Replace "#endif
 !" with "#endif /* */") [p=tglek@mozilla.com (Taras Glek) r=stuart
 a1.9=schrep]

---
 jpeg/jdapimin.c | 16 ++++++++--------
 jpeg/jdcolor.c  |  2 +-
 jpeg/jdmaster.c |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jpeg/jdapimin.c b/jpeg/jdapimin.c
index c07918c2278..a2d3f975157 100644
--- a/jpeg/jdapimin.c
+++ b/jpeg/jdapimin.c
@@ -32,8 +32,8 @@ int SSE2Available = 0;
 static int sse2support();
 #else
 static int sse2supportGCC();
-#endif ! HAVE_SSE2_INTEL_MNEMONICS
-#endif ! HAVE_SSE2_INTRINSICS
+#endif /* HAVE_SSE2_INTEL_MNEMONICS */
+#endif /* HAVE_SSE2_INTRINSICS */
 
 
 /*
@@ -71,8 +71,8 @@ jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize)
     cpuidDetected = 1;
   }
 
-#endif ! HAVE_SSE2_INTRINSICS
-#endif ! HAVE_MMX_INTEL_MNEMONICS
+#endif /* HAVE_SSE2_INTRINSICS */
+#endif /* HAVE_MMX_INTEL_MNEMONICS */
 
   /* For debugging purposes, zero the whole master structure.
    * But error manager pointer is already there, so save and restore it.
@@ -475,8 +475,8 @@ static int sse2supportGCC()
 #if defined(__GNUC__) && defined(__i386__)
 #if defined(XP_MACOSX)
   return 1;
-#endif ! XP_MACOSX
-#endif ! GNUC && i386
+#endif /* XP_MACOSX */
+#endif /* GNUC && i386 */
 
   /* Add checking for SSE2 support for other platforms here */
 
@@ -484,6 +484,6 @@ static int sse2supportGCC()
 
   return 2;
 }
-#endif ! HAVE_SSE2_INTRINSICS
-#endif ! HAVE_SSE2_INTEL_MNEMONICS
+#endif /* HAVE_SSE2_INTRINSICS */
+#endif /* HAVE_SSE2_INTEL_MNEMONICS */
 
diff --git a/jpeg/jdcolor.c b/jpeg/jdcolor.c
index a8b8db5284b..ca8dfc08950 100644
--- a/jpeg/jdcolor.c
+++ b/jpeg/jdcolor.c
@@ -296,7 +296,7 @@ build_ycc_rgb_table (j_decompress_ptr cinfo)
     /* We also add in ONE_HALF so that need not do it in inner loop */
     cconvert->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
   }
-#endif ! 0
+#endif /* 0 */
 }
 
 
diff --git a/jpeg/jdmaster.c b/jpeg/jdmaster.c
index 37ae7866ef5..1047fe873af 100644
--- a/jpeg/jdmaster.c
+++ b/jpeg/jdmaster.c
@@ -377,7 +377,7 @@ prepare_range_limit_table (j_decompress_ptr cinfo)
   MEMCOPY(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
 	  cinfo->sample_range_limit, CENTERJSAMPLE * SIZEOF(JSAMPLE));
 
-#endif ! 0
+#endif /* 0 */
 }