--- portab.h	2002/03/30 16:21:47	1.13
+++ portab.h	2002/05/06 03:51:43	1.17
@@ -4,18 +4,37 @@
 #if defined(WIN32)
 
 #include <windows.h>
+#include <stdio.h>
+
+
+#define DPRINTF_BUF_SZ  1024
+static void dprintf(char *fmt, ...)
+{
+	va_list args;
+	char buf[DPRINTF_BUF_SZ];
+
+	va_start(args, fmt);
+	vsprintf(buf, fmt, args);
+	OutputDebugString(buf);
+	fprintf(stdout, "%s\n", buf);
+}
+
+
+#define DEBUGCBR(A,B,C) { char tmp[100]; wsprintf(tmp, "CBR: frame: %i, quant: %i, deviation: %i\n", (A), (B), (C)); OutputDebugString(tmp); }
 
 #ifdef _DEBUG
 #define DEBUG(S) OutputDebugString((S));
 #define DEBUG1(S,I) { char tmp[100]; wsprintf(tmp, "%s %i\n", (S), (I)); OutputDebugString(tmp); }
 #define DEBUG2(X,A,B) { char tmp[100]; wsprintf(tmp, "%s %i %i\n", (X), (A), (B)); OutputDebugString(tmp); }
 #define DEBUG3(X,A,B,C){ char tmp[1000]; wsprintf(tmp,"%s %i %i %i",(X),(A), (B), (C)); OutputDebugString(tmp); }
+#define DEBUG4(X,A,B,C,D){ char tmp[1000]; wsprintf(tmp,"%s %i %i %i %i",(X),(A), (B), (C), (D)); OutputDebugString(tmp); }
 #define DEBUG8(X,A,B,C,D,E,F,G,H){ char tmp[1000]; wsprintf(tmp,"%s %i %i %i %i %i %i %i %i",(X),(A),(B),(C),(D),(E),(F),(G),(H)); OutputDebugString(tmp); }
 #else
 #define DEBUG(S)
 #define DEBUG1(S,I)
 #define DEBUG2(X,A,B)
 #define DEBUG3(X,A,B,C)
+#define DEBUG4(X,A,B,C,D)
 #define DEBUG8(X,A,B,C,D,E,F,G,H)
 #endif
 
@@ -61,8 +80,7 @@
 	return ts;
 }
 
-#elif defined(LINUX) || defined(DJGPP)
-
+#elif defined(LINUX) || defined(DJGPP) || defined(FREEBSD)
 
 #ifdef _DEBUG
 
@@ -73,12 +91,14 @@
 #define DEBUG2(S,A,B)             fprintf(DEBUG_WHERE, "%s%i=%i\n", (S), (A), (B))
 #define DEBUG3(S,A,B,C)           fprintf(DEBUG_WHERE, "%s %i %x %x\n", (S), (A), (B), (C))
 #define DEBUG8(S,A,B,C,D,E,F,G,H)
+#define DEBUGCBR(A,B,C)           fprintf(DEBUG_WHERE, "CBR: frame: %i, quant: %i, deviation: %i\n", (A), (B), (C))
 #else
 #define DEBUG(S)
 #define DEBUG1(S,I)
 #define DEBUG2(X,A,B)
 #define DEBUG3(X,A,B,C)
 #define DEBUG8(X,A,B,C,D,E,F,G,H)
+#define DEBUGCBR(A,B,C)
 #endif
 
 #define CACHE_LINE  16
@@ -93,7 +113,7 @@
 
 #else
 
-#define #define #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+#define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
 	__attribute__ ((__aligned__(CACHE_LINE))) type name[(sizex)*(sizey)]
 
 #define int8_t   char
@@ -158,6 +178,7 @@
 #define DEBUG2(X,A,B)
 #define DEBUG3(X,A,B,C)
 #define DEBUG8(X,A,B,C,D,E,F,G,H)
+#define DEBUGCBR(A,B,C)
 
 #include <inttypes.h>