Imported from libpng-1.4.0beta2.tar
diff --git a/pngset.c b/pngset.c
index 48af5c0..1ee8b43 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.2.9 April 14, 2006
+ * Last changed in libpng 1.4.0 April 20, 2006
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2006 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1179,6 +1179,7 @@
        return;
 
     settable_mmx_flags =
+#ifdef PNG_MMX_CODE_SUPPORTED
 #ifdef PNG_HAVE_MMX_COMBINE_ROW
                          PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  |
 #endif
@@ -1191,6 +1192,7 @@
                          PNG_ASM_FLAG_MMX_READ_FILTER_AVG   |
                          PNG_ASM_FLAG_MMX_READ_FILTER_PAETH |
 #endif
+#endif
                          0;
 
     /* could be some non-MMX ones in the future, but not currently: */