--- portab.h	2003/03/04 16:33:16	1.47
+++ portab.h	2004/04/12 14:05:08	1.51
@@ -3,27 +3,25 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Portable macros, types and inlined assembly -
  *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
- *               2002 Peter Ross <pross@xvid.org>
- *               2002 Edouard Gomez <ed.gomez@free.fr>
+ *  Copyright(C) 2002      Michael Militzer <isibaar@xvid.org>
+ *               2002-2003 Peter Ross <pross@xvid.org>
+ *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *
- *  This file is part of XviD, a free MPEG-4 video encoder/decoder
- *
- *  XviD is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  This program is free software ; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation ; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  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.47 2003/03/04 16:33:16 chl Exp $
+ * $Id: portab.h,v 1.51 2004/04/12 14:05:08 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -34,26 +32,11 @@
  *  Common things
  ****************************************************************************/
 
-/* Debug level masks */
-#define DPRINTF_ERROR       0x00000001
-#define DPRINTF_STARTCODE   0x00000002
-#define DPRINTF_HEADER      0x00000004
-#define DPRINTF_TIMECODE    0x00000008
-#define DPRINTF_MB          0x00000010
-#define DPRINTF_COEFF       0x00000020
-#define DPRINTF_MV          0x00000040
-#define DPRINTF_RC          0x00000080
-#define DPRINTF_DEBUG       0x80000000
-
-/* debug level for this library */
-#ifdef _DEBUG
-#define DPRINTF_LEVEL       0x000000ff
-#else
-#define DPRINTF_LEVEL       0
-#endif
-
 /* Buffer size for msvc implementation because it outputs to DebugOutput */
+#if defined(_DEBUG)
+extern unsigned int xvid_debug;
 #define DPRINTF_BUF_SZ  1024
+#endif
 
 /*****************************************************************************
  *  Types used in XviD sources
@@ -85,19 +68,27 @@
 #endif
 
 /*****************************************************************************
- *  Some things that are only architecture dependant 
+ *  Some things that are only architecture dependant
  ****************************************************************************/
 
 #if defined(ARCH_IS_32BIT)
 #    define CACHE_LINE 64
 #    define ptr_t uint32_t
 #    define intptr_t int32_t
-#    define uintptr_t uint32_t
+#    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
-#    define uintptr_t uint64_t
+#    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.
 #endif
@@ -133,13 +124,13 @@
 #   ifdef _DEBUG
     static __inline void DPRINTF(int level, char *fmt, ...)
     {
-        if (DPRINTF_LEVEL & level) {
+        if (xvid_debug & level) {
             va_list args;
             char buf[DPRINTF_BUF_SZ];
             va_start(args, fmt);
             vsprintf(buf, fmt, args);
             OutputDebugString(buf);
-            fprintf(stderr, "%s\n", buf);
+            fprintf(stderr, "%s", buf);
          }
      }
 #    else
@@ -224,9 +215,8 @@
         {
             va_list args;
             va_start(args, format);
-            if(DPRINTF_LEVEL & level) {
+            if(xvid_debug & level) {
                    vfprintf(stderr, format, args);
-                   fprintf(stderr, "\n");
             }
         }
 
@@ -258,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));
 
@@ -337,12 +336,12 @@
 #    ifdef _DEBUG
      static __inline void DPRINTF(int level, char *fmt, ...)
      {
-         if (DPRINTF_LEVEL & level) {
+         if (xvid_debug & level) {
              va_list args;
              char buf[DPRINTF_BUF_SZ];
              va_start(args, fmt);
              vsprintf(buf, fmt, args);
-             fprintf(stderr, "%s\n", buf);
+             fprintf(stderr, "%s", buf);
          }
      }
 #    else /* _DEBUG */
@@ -417,9 +416,8 @@
         {
             va_list args;
             va_start(args, format);
-            if(DPRINTF_LEVEL & level) {
+            if(xvid_debug & level) {
                    vfprintf(stderr, format, args);
-                   fprintf(stderr, "\n");
             }
         }