--- portab.h	2003/05/17 13:26:51	1.46.2.6
+++ portab.h	2003/03/04 16:33:16	1.47
@@ -23,7 +23,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.6 2003/05/17 13:26:51 suxen_drol Exp $
+ * $Id: portab.h,v 1.47 2003/03/04 16:33:16 chl Exp $
  *
  ****************************************************************************/
 
@@ -34,11 +34,26 @@
  *  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
@@ -77,20 +92,12 @@
 #    define CACHE_LINE 64
 #    define ptr_t uint32_t
 #    define intptr_t int32_t
-#    if _MSC_VER < 1300 
-#        define uintptr_t uint32_t 
-#    else
-#        include <stdarg.h>
-#    endif 
+#    define uintptr_t uint32_t
 #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
-#        include <stdarg.h>
-#    endif 
+#    define uintptr_t uint64_t
 #else
 #    error You are trying to compile XviD without defining address bus size.
 #endif
@@ -126,7 +133,7 @@
 #   ifdef _DEBUG
     static __inline void DPRINTF(int level, char *fmt, ...)
     {
-        if (xvid_debug & level) {
+        if (DPRINTF_LEVEL & level) {
             va_list args;
             char buf[DPRINTF_BUF_SZ];
             va_start(args, fmt);
@@ -217,7 +224,7 @@
         {
             va_list args;
             va_start(args, format);
-            if(xvid_debug & level) {
+            if(DPRINTF_LEVEL & level) {
                    vfprintf(stderr, format, args);
                    fprintf(stderr, "\n");
             }
@@ -330,7 +337,7 @@
 #    ifdef _DEBUG
      static __inline void DPRINTF(int level, char *fmt, ...)
      {
-         if (xvid_debug & level) {
+         if (DPRINTF_LEVEL & level) {
              va_list args;
              char buf[DPRINTF_BUF_SZ];
              va_start(args, fmt);
@@ -410,7 +417,7 @@
         {
             va_list args;
             va_start(args, format);
-            if(xvid_debug & level) {
+            if(DPRINTF_LEVEL & level) {
                    vfprintf(stderr, format, args);
                    fprintf(stderr, "\n");
             }