--- xvid.c	2003/02/12 11:46:18	1.33.2.23
+++ xvid.c	2003/02/15 15:22:17	1.41
@@ -37,7 +37,7 @@
  *  - 22.12.2001  API change: added xvid_init() - Isibaar
  *  - 16.12.2001	inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: xvid.c,v 1.33.2.23 2003/02/12 11:46:18 syskin Exp $
+ *  $Id: xvid.c,v 1.41 2003/02/15 15:22:17 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -65,7 +65,7 @@
 #include "utils/timer.h"
 #include "bitstream/mbcoding.h"
 
-#if defined(ARCH_X86)
+#if defined(ARCH_IS_IA32)
 
 #if defined(_MSC_VER)
 #	include <windows.h>
@@ -136,7 +136,7 @@
 	/* enable native assembly optimizations by default */
 	unsigned int cpu_flags = XVID_CPU_ASM;
 
-#if defined(ARCH_X86)
+#if defined(ARCH_IS_IA32)
 	cpu_flags |= check_cpu_features();
 	if ((cpu_flags & XVID_CPU_SSE) && sigill_check(sse_os_trigger))
 		cpu_flags &= ~XVID_CPU_SSE;
@@ -145,8 +145,8 @@
 		cpu_flags &= ~XVID_CPU_SSE2;
 #endif
 
-#if defined(ARCH_PPC)
-#if defined(ARCH_PPC_ALTIVEC)
+#if defined(ARCH_IS_PPC)
+#if defined(ARCH_IS_PPC_ALTIVEC)
 	cpu_flags |= XVID_CPU_ALTIVEC;
 #endif
 #endif
@@ -318,7 +318,7 @@
 	
 //	Halfpel8_Refine = Halfpel8_Refine_c;
 
-#if defined(ARCH_X86)
+#if defined(ARCH_IS_IA32)
 
 	if ((cpu_flags & XVID_CPU_ASM))
 	{
@@ -525,7 +525,7 @@
 	}
 #endif
 
-#if defined(ARCH_IA64)
+#if defined(ARCH_IS_IA64)
 	if ((cpu_flags & XVID_CPU_ASM)) { //use assembler routines?
 	  idct_ia64_init();
 	  fdct = fdct_ia64;
@@ -552,7 +552,7 @@
 	}
 #endif 
 
-#if defined(ARCH_PPC)
+#if defined(ARCH_IS_PPC)
 	if ((cpu_flags & XVID_CPU_ASM))
 	{
 		calc_cbp = calc_cbp_ppc;