--- a/jpeg/jdapimin.c
+++ b/jpeg/jdapimin.c
@@ -27,18 +27,18 @@ static int mmxsupport();
 #endif
 
 #ifdef HAVE_SSE2_INTRINSICS
 int SSE2Available = 0;
 #ifdef HAVE_SSE2_INTEL_MNEMONICS
 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 */
 
 
 /*
  * Initialization of a JPEG decompression object.
  * The error manager must already be set up (in case memory manager fails).
  */
 
 GLOBAL(void)
@@ -66,18 +66,18 @@ jpeg_CreateDecompress (j_decompress_ptr 
 #ifdef HAVE_SSE2_INTRINSICS
   static int cpuidDetected = 0;
 
   if(!cpuidDetected) {
     SSE2Available = sse2supportGCC();
     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.
    */
 
   /* Guard against version mismatches between library and caller. */
   cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
   if (version != JPEG_LIB_VERSION)
@@ -470,20 +470,20 @@ static int sse2support()
 static int sse2supportGCC()
 {
 
   /* Mac Intel started with Core Duo chips which have SSE2 Support */
 
 #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 */
 
   /* We don't have SSE2 intrinsics support */
 
   return 2;
 }
-#endif ! HAVE_SSE2_INTRINSICS
-#endif ! HAVE_SSE2_INTEL_MNEMONICS
+#endif /* HAVE_SSE2_INTRINSICS */
+#endif /* HAVE_SSE2_INTEL_MNEMONICS */
 

--- a/jpeg/jdcolor.c
+++ b/jpeg/jdcolor.c
@@ -291,17 +291,17 @@ build_ycc_rgb_table (j_decompress_ptr ci
     cconvert->Cb_b_tab[i] = (int)
 		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
     /* Cr=>G value is scaled-up -0.71414 * x */
     cconvert->Cr_g_tab[i] = (- FIX(0.71414)) * x;
     /* Cb=>G value is scaled-up -0.34414 * x */
     /* 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 */
 }
 
 
 /*
  * Convert some rows of samples to the output colorspace.
  *
  * Note that we change from noninterleaved, one-plane-per-component format
  * to interleaved-pixel format.  The output buffer is therefore three times

--- a/jpeg/jdmaster.c
+++ b/jpeg/jdmaster.c
@@ -372,17 +372,17 @@ prepare_range_limit_table (j_decompress_
   for (i = CENTERJSAMPLE; i < 2*(MAXJSAMPLE+1); i++)
     table[i] = MAXJSAMPLE;
   /* Second half of post-IDCT table */
   MEMZERO(table + (2 * (MAXJSAMPLE+1)),
 	  (2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * SIZEOF(JSAMPLE));
   MEMCOPY(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
 	  cinfo->sample_range_limit, CENTERJSAMPLE * SIZEOF(JSAMPLE));
 
-#endif ! 0
+#endif /* 0 */
 }
 
 
 /*
  * Master selection of decompression modules.
  * This is done once at jpeg_start_decompress time.  We determine
  * which modules will be used and give them appropriate initialization calls.
  * We also initialize the decompressor input side to begin consuming data.