--- portab.h	2002/10/19 12:20:33	1.34
+++ portab.h	2002/11/26 23:50:57	1.39
@@ -7,30 +7,52 @@
  *               2002 Peter Ross <pross@xvid.org>
  *               2002 Edouard Gomez <ed.gomez@wanadoo.fr>
  *
- *  This program is an implementation of a part of one or more MPEG-4
- *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
- *  to use this software module in hardware or software products are
- *  advised that its use may infringe existing patents or copyrights, and
- *  any such use would be at such party's own risk.  The original
- *  developer of this software module and his/her company, and subsequent
- *  editors and their companies, will have no liability for use of this
- *  software or modifications or derivatives thereof.
- *
- *  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
+ *  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
  *  (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.34 2002/10/19 12:20:33 edgomez Exp $
+ *  Under section 8 of the GNU General Public License, the copyright
+ *  holders of XVID explicitly forbid distribution in the following
+ *  countries:
+ *
+ *    - Japan
+ *    - United States of America
+ *
+ *  Linking XviD statically or dynamically with other modules is making a
+ *  combined work based on XviD.  Thus, the terms and conditions of the
+ *  GNU General Public License cover the whole combination.
+ *
+ *  As a special exception, the copyright holders of XviD give you
+ *  permission to link XviD with independent modules that communicate with
+ *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
+ *  license terms of these independent modules, and to copy and distribute
+ *  the resulting combined work under terms of your choice, provided that
+ *  every copy of the combined work is accompanied by a complete copy of
+ *  the source code of XviD (the version of XviD used to produce the
+ *  combined work), being distributed under the terms of the GNU General
+ *  Public License plus this exception.  An independent module is a module
+ *  which is not derived from or based on XviD.
+ *
+ *  Note that people who make modified versions of XviD are not obligated
+ *  to grant this special exception for their modified versions; it is
+ *  their choice whether to do so.  The GNU General Public License gives
+ *  permission to release a modified version without this exception; this
+ *  exception also makes it possible to release a modified version which
+ *  carries forward this exception.
+ *
+ * $Id: portab.h,v 1.39 2002/11/26 23:50:57 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -88,7 +110,7 @@
  | Fallback when using gcc
  *---------------------------------------------------------------------------*/
 
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) || defined(__ICC)
 
 #    define int8_t   char
 #    define uint8_t  unsigned char
@@ -118,7 +140,9 @@
 #    define CACHE_LINE  32
 #    define ptr_t uint64_t
 #else
-#    error Architecture not supported.
+/* todo: fix cache_line 0 operation */
+#    define CACHE_LINE  16
+#    define ptr_t uint32_t
 #endif
 
 /*****************************************************************************
@@ -188,7 +212,14 @@
  | msvc unknown architecture
  *---------------------------------------------------------------------------*/
 #    else
-#        error Architecture not supported.
+/* ANSI C version of BSWAP */
+#define BSWAP(x) \
+ x = ((((x) & 0xff000000) >> 24) | \
+     (((x) & 0x00ff0000) >>  8) | \
+     (((x) & 0x0000ff00) <<  8) | \
+     (((x) & 0x000000ff) << 24))
+
+#define EMMS()
 #    endif
 
 
@@ -198,7 +229,7 @@
  *  GNU CC compiler stuff
  ****************************************************************************/
 
-#elif defined(__GNUC__) /* Compiler test */
+#elif defined(__GNUC__) || defined(__ICC) /* Compiler test */
 
 /*----------------------------------------------------------------------------
  | Common gcc stuff
@@ -324,7 +355,14 @@
  | XviD + gcc unsupported Architecture
  *---------------------------------------------------------------------------*/
 #    else
-#        error Architecture not supported.
+/* ANSI C version of BSWAP */
+#define BSWAP(x) \
+ x = ((((x) & 0xff000000) >> 24) | \
+     (((x) & 0x00ff0000) >>  8) | \
+     (((x) & 0x0000ff00) <<  8) | \
+     (((x) & 0x000000ff) << 24))
+
+#define EMMS()
 #    endif /* Architecture checking */
 
 /*****************************************************************************