--- trunk/xvidcore/src/portab.h	2002/06/30 10:46:29	252
+++ branches/dev-api-3/xvidcore/src/portab.h	2002/11/07 10:31:03	631
@@ -12,8 +12,13 @@
 #define DPRINTF_MV			0x00000040
 #define DPRINTF_DEBUG		0x80000000
 
+
+#ifdef _DEBUG
 // debug level
-#define DPRINTF_LEVEL		0
+#define DPRINTF_LEVEL		0x0000000f
+#else
+#define DPRINTF_LEVEL		0x0
+#endif
 
 
 #define DPRINTF_BUF_SZ  1024
@@ -105,7 +110,7 @@
 	return ts;
 }
 
-#elif defined(LINUX) || defined(DJGPP) || defined(FREEBSD)
+#elif defined(LINUX) || defined(DJGPP) || defined(FREEBSD) || defined(BEOS)
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -143,9 +148,13 @@
 #define DEBUGCBR(A,B,C)
 #endif
 
-#if defined(LINUX)
+#if defined(LINUX) || defined(BEOS)
 
+#if defined(BEOS)
+#include <inttypes.h>
+#else
 #include <stdint.h>
+#endif
 
 #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
 	type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
@@ -214,16 +223,55 @@
 
 #define EMMS()
 
+#ifdef __GNUC__
+
+// needed for bitstream.h
+#define BSWAP(a)  __asm__ __volatile__ ("mux1 %1 = %0, @rev" \
+			";;" \
+			"shr.u %1 = %1, 32" : "=r" (a) : "r" (a));
+
+// rdtsc replacement for ia64
+static __inline int64_t read_counter() {
+	unsigned long result;
+
+//	__asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory");
+//	while (__builtin_expect ((int) result == -1, 0))
+		__asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory");
+	return result;
+
+}
+
+/* we are missing our ia64intrin.h file, but according to the 
+   Intel's ecc manual, this should be the right way ... 
+   this 
+
+#elif defined(__INTEL_COMPILER) 
+
+#include <ia64intrin.h>
+
+static __inline int64_t read_counter() {
+  return __getReg(44);
+}
+
+#define BSWAP(a) ((unsigned int) (_m64_mux1(a, 0xb) >> 32))
+*/
+
+#else 
+
 // needed for bitstream.h
 #define BSWAP(a) \
 	 ((a) = ( ((a)&0xff)<<24) | (((a)&0xff00)<<8) | (((a)>>8)&0xff00) | (((a)>>24)&0xff))
 
 // rdtsc command most likely not supported,
 // so just dummy code here
-static __inline int64_t read_counter() {
+static __inline int64_t
+read_counter()
+{
 	return 0;
 }
 
+#endif // gcc or ecc
+
 #else
 #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
 #define EMMS() __asm__("emms\n\t")
@@ -252,6 +300,8 @@
 
 #else							// OTHER OS
 
+#define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+	__declspec(align(alignment)) type name[(sizex)*(sizey)]
 
 #include <stdio.h>
 #include <stdarg.h>