--- portab.h	2008/11/30 16:38:31	1.58.2.1
+++ portab.h	2010/03/09 10:00:14	1.60
@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Portable macros, types and inlined assembly -
  *
- *  Copyright(C) 2002      Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2002-2010 Michael Militzer <isibaar@xvid.org>
  *               2002-2003 Peter Ross <pross@xvid.org>
  *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *
@@ -21,7 +21,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.58.2.1 2008/11/30 16:38:31 Isibaar Exp $
+ * $Id: portab.h,v 1.60 2010/03/09 10:00:14 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -39,7 +39,7 @@
 #endif
 
 /*****************************************************************************
- *  Types used in XviD sources
+ *  Types used in Xvid sources
  ****************************************************************************/
 
 /*----------------------------------------------------------------------------
@@ -68,6 +68,45 @@
 #endif
 
 /*****************************************************************************
+ *  Some things that are OS dependant
+ ****************************************************************************/
+
+#ifdef WIN32
+
+# include <windows.h>
+# define pthread_t				HANDLE
+# define pthread_create(t,u,f,d) *(t)=CreateThread(NULL,0,f,d,0,NULL)
+# define pthread_join(t,s)		{ WaitForSingleObject(t,INFINITE); \
+									CloseHandle(t); } 
+# define sched_yield()			Sleep(0);
+static __inline int pthread_num_processors_np() 
+{
+	DWORD p_aff, s_aff, r = 0;
+	GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR) &p_aff, (PDWORD_PTR) &s_aff);
+	for(; p_aff != 0; p_aff>>=1) r += p_aff&1;
+	return r;
+}
+
+#elif defined(__amigaos4__)
+
+# include <pthread.h>
+# include <proto/dos.h>
+# define sched_yield() IDOS->Delay(1)
+
+#elif defined(SYS_BEOS)
+
+# include <kernel/OS.h>
+# define pthread_t				thread_id
+# define pthread_create(t,u,f,d) { *(t)=spawn_thread(f,"",10,d); \
+								resume_thread(*(t)); }
+# define pthread_join(t,s)		wait_for_thread(t,(long*)s)
+# define sched_yield()			snooze(0) /* is this correct? */
+
+#else
+# include <pthread.h>
+#endif
+
+/*****************************************************************************
  *  Some things that are only architecture dependant
  ****************************************************************************/
 
@@ -92,7 +131,7 @@
 #        define uintptr_t uint64_t
 #    endif
 #else
-#    error You are trying to compile XviD without defining address bus size.
+#    error You are trying to compile Xvid without defining address bus size.
 #endif
 
 /*****************************************************************************
@@ -193,10 +232,10 @@
 
 /*----------------------------------------------------------------------------
   | msvc Not given architecture - This is probably an user who tries to build
-  | XviD the wrong way.
+  | Xvid the wrong way.
  *---------------------------------------------------------------------------*/
 #    else
-#        error You are trying to compile XviD without defining the architecture type.
+#        error You are trying to compile Xvid without defining the architecture type.
 #    endif
 
 
@@ -327,10 +366,10 @@
 
 /*----------------------------------------------------------------------------
   | gcc Not given architecture - This is probably an user who tries to build
-  | XviD the wrong way.
+  | Xvid the wrong way.
  *---------------------------------------------------------------------------*/
 #    else
-#        error You are trying to compile XviD without defining the architecture type.
+#        error You are trying to compile Xvid without defining the architecture type.
 #    endif
 
 
@@ -400,10 +439,10 @@
 
 /*----------------------------------------------------------------------------
   | watcom Not given architecture - This is probably an user who tries to build
-  | XviD the wrong way.
+  | Xvid the wrong way.
  *---------------------------------------------------------------------------*/
 #    else
-#        error You are trying to compile XviD without defining the architecture type.
+#        error You are trying to compile Xvid without defining the architecture type.
 #    endif