--- portab.h	2003/10/01 23:23:00	1.46.2.9
+++ portab.h	2004/04/12 14:05:08	1.51
@@ -21,7 +21,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: portab.h,v 1.46.2.9 2003/10/01 23:23:00 edgomez Exp $
+ * $Id: portab.h,v 1.51 2004/04/12 14:05:08 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -75,19 +75,19 @@
 #    define CACHE_LINE 64
 #    define ptr_t uint32_t
 #    define intptr_t int32_t
-#    if _MSC_VER < 1300
-#        define uintptr_t uint32_t
-#    else
+#    if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
 #        include <stdarg.h>
+#    else
+#        define uintptr_t uint32_t
 #    endif
 #elif defined(ARCH_IS_64BIT)
 #    define CACHE_LINE  64
 #    define ptr_t uint64_t
 #    define intptr_t int64_t
-#    if _MSC_VER < 1300
-#        define uintptr_t uint64_t
-#    else
+#    if defined (_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
 #        include <stdarg.h>
+#    else
+#        define uintptr_t uint64_t
 #    endif
 #else
 #    error You are trying to compile XviD without defining address bus size.
@@ -248,6 +248,15 @@
  | gcc PPC and PPC Altivec specific macros/functions
  *---------------------------------------------------------------------------*/
 #    elif defined(ARCH_IS_PPC)
+
+#        if defined(HAVE_ALTIVEC_PARENTHESES_DECL)
+#            define AVV(x...) (x)
+#        elif defined(HAVE_ALTIVEC_BRACES_DECL)
+#            define AVV(x...) {x}
+#        else
+#            error Trying to compile PPC target without a vector declaration type.
+#        endif
+
 #        define BSWAP(a) __asm__ __volatile__ \
                 ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a));