--- portab.h	2002/03/21 17:27:06	1.6
+++ portab.h	2002/03/28 20:57:24	1.9
@@ -32,7 +32,15 @@
 #define EMMS() __asm {emms}
 
 #define CACHE_LINE  16
-#define CACHE_ALIGN __declspec(align(CACHE_LINE))
+
+#if _MSC_VER <= 1200
+#define #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+	type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
+	type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1))
+#else
+#define #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+	__declspec(align(CACHE_LINE)) type name[(sizex)*(sizey)]
+#endif
 
 // needed for bitstream.h
 #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
@@ -59,11 +67,11 @@
 #ifdef _DEBUG
 
 #include <stdio.h>
-#define DEBUG_WHERE		stdout
-#define DEBUG(S)        fprintf(DEBUG_WHERE, "%s\n", (S));
-#define DEBUG1(S,I)     fprintf(DEBUG_WHERE, "%s %i\n", (S), (I))
-#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 DEBUG_WHERE               stdout
+#define DEBUG(S)                  fprintf(DEBUG_WHERE, "%s\n", (S));
+#define DEBUG1(S,I)               fprintf(DEBUG_WHERE, "%s %i\n", (S), (I))
+#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)
 #else
 #define DEBUG(S)
@@ -74,22 +82,27 @@
 #endif
 
 #define CACHE_LINE  16
-#define CACHE_ALIGN __attribute__ ((__aligned__(CACHE_LINE)))
-
 
 #if defined(LINUX)
 
 #include <stdint.h>
 
+#define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+	type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
+	type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1))
+
 #else
 
-#define int8_t char
-#define uint8_t unsigned char
-#define int16_t short
+#define #define #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+	__attribute__ ((__aligned__(CACHE_LINE))) type name[(sizex)*(sizey)]
+
+#define int8_t   char
+#define uint8_t  unsigned char
+#define int16_t  short
 #define uint16_t unsigned short
-#define int32_t int
+#define int32_t  int
 #define uint32_t unsigned int
-#define int64_t long long
+#define int64_t  long long
 #define uint64_t unsigned long long
 
 #endif
@@ -103,7 +116,7 @@
 #else
 	#define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
 	#define EMMS() __asm__("emms\n\t")
-#endif
+
 
 // needed for timer.c
 static __inline int64_t read_counter() {
@@ -117,6 +130,8 @@
     return ts;
 }
 
+#endif
+
 #else // OTHER OS
 
 #define DEBUG(S)