# HG changeset patch
# User diego
# Date 1203778063 0
# Node ID 7a541b991b85fc050d112819abc70bb7ed24013c
# Parent  ad048f993f66ad555709c45c5eff5966f883a98f
Merge two #ifdefs into one.

diff -r ad048f993f66 -r 7a541b991b85 libmpeg2/libmpeg-0.4.1.diff
--- a/libmpeg2/libmpeg-0.4.1.diff	Sat Feb 23 13:13:28 2008 +0000
+++ b/libmpeg2/libmpeg-0.4.1.diff	Sat Feb 23 14:47:43 2008 +0000
@@ -942,7 +942,7 @@
 ===================================================================
 --- libmpeg2/motion_comp_iwmmxt.c	(revision 0)
 +++ libmpeg2/motion_comp_iwmmxt.c	(revision 0)
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,59 @@
 +/*
 + * motion_comp_iwmmxt.c
 + * Copyright (C) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
@@ -967,8 +967,7 @@
 +
 +#include "config.h"
 +
-+#ifdef ARCH_ARM
-+#ifdef HAVE_IWMMXT
++#if defined(ARCH_ARM) && defined(HAVE_IWMMXT)
 +
 +#include <inttypes.h>
 +
@@ -1002,5 +1001,4 @@
 +     avg_pixels8_iwmmxt, avg_pixels8_x2_iwmmxt,  avg_pixels8_y2_iwmmxt,  avg_pixels8_xy2_iwmmxt}, \
 +};
 +
-+#endif
-+#endif
++#endif /* defined(ARCH_ARM) && defined(HAVE_IWMMXT) */
diff -r ad048f993f66 -r 7a541b991b85 libmpeg2/motion_comp_iwmmxt.c
--- a/libmpeg2/motion_comp_iwmmxt.c	Sat Feb 23 13:13:28 2008 +0000
+++ b/libmpeg2/motion_comp_iwmmxt.c	Sat Feb 23 14:47:43 2008 +0000
@@ -22,8 +22,7 @@
 
 #include "config.h"
 
-#ifdef ARCH_ARM
-#ifdef HAVE_IWMMXT
+#if defined(ARCH_ARM) && defined(HAVE_IWMMXT)
 
 #include <inttypes.h>
 
@@ -57,5 +56,4 @@
      avg_pixels8_iwmmxt, avg_pixels8_x2_iwmmxt,  avg_pixels8_y2_iwmmxt,  avg_pixels8_xy2_iwmmxt}, \
 };
 
-#endif
-#endif
+#endif /* defined(ARCH_ARM) && defined(HAVE_IWMMXT) */