diff -r -u mjpegtools-1.3b4-orig/aenc/encode.c mjpegtools-1.3b4-osx/aenc/encode.c
--- mjpegtools-1.3b4-orig/aenc/encode.c	Wed Apr 11 12:47:50 2001
+++ mjpegtools-1.3b4-osx/aenc/encode.c	Wed Apr 25 11:22:30 2001
@@ -90,7 +90,9 @@
 
 #ifdef UNIX
 #include <unistd.h>
+#ifndef __APPLE__
 extern void swab( void *, void *, size_t );
+#endif
 #endif
 
 extern int freq_in;
diff -r -u mjpegtools-1.3b4-orig/mpeg2enc/putseq.c mjpegtools-1.3b4-osx/mpeg2enc/putseq.c
--- mjpegtools-1.3b4-orig/mpeg2enc/putseq.c	Tue Apr 17 12:32:43 2001
+++ mjpegtools-1.3b4-osx/mpeg2enc/putseq.c	Wed Apr 25 11:22:30 2001
@@ -643,9 +643,9 @@
 #endif
 }
 
-semaphore_t worker_available =  SEMAPHORE_INITIALIZER;
-semaphore_t picture_available = SEMAPHORE_INITIALIZER;
-semaphore_t picture_started = SEMAPHORE_INITIALIZER;
+mj_semaphore_t worker_available =  SEMAPHORE_INITIALIZER;
+mj_semaphore_t picture_available = SEMAPHORE_INITIALIZER;
+mj_semaphore_t picture_started = SEMAPHORE_INITIALIZER;
 static volatile pict_data_s *picture_to_encode;
 
 #ifdef SINGLE_THREADED_FOR_DEBUG
@@ -733,12 +733,12 @@
 
 	for(;;)
 	{
-		semaphore_signal( &worker_available, 1);
-		semaphore_wait( &picture_available );
+		mj_semaphore_signal( &worker_available, 1);
+		mj_semaphore_wait( &picture_available );
 		/* Precisely *one* worker is started after update of
 		   picture_for_started_worker, so no need for handshake.  */
 		picture = (pict_data_s *)picture_to_encode;
-		semaphore_signal( &picture_started, 1);
+		mj_semaphore_signal( &picture_started, 1);
 
 		/* ALWAYS do-able */
 		if (!quiet )
@@ -824,10 +824,10 @@
 static void parencodepict( pict_data_s *picture )
 {
 
-	semaphore_wait( &worker_available );
+	mj_semaphore_wait( &worker_available );
 	picture_to_encode = picture;
-	semaphore_signal( &picture_available, 1 );
-	semaphore_wait( &picture_started );
+	mj_semaphore_signal( &picture_available, 1 );
+	mj_semaphore_wait( &picture_started );
 }
 
 
diff -r -u mjpegtools-1.3b4-orig/mpeg2enc/quantize.c mjpegtools-1.3b4-osx/mpeg2enc/quantize.c
--- mjpegtools-1.3b4-orig/mpeg2enc/quantize.c	Thu Mar 29 16:13:00 2001
+++ mjpegtools-1.3b4-osx/mpeg2enc/quantize.c	Wed Apr 25 11:22:30 2001
@@ -50,7 +50,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <fenv.h>
+// ??? #include <fenv.h>
 #include "global.h"
 #include "cpu_accel.h"
 #include "simd.h"
diff -r -u mjpegtools-1.3b4-orig/mpeg2enc/synchrolib.c mjpegtools-1.3b4-osx/mpeg2enc/synchrolib.c
--- mjpegtools-1.3b4-orig/mpeg2enc/synchrolib.c	Sun Mar 18 00:18:09 2001
+++ mjpegtools-1.3b4-osx/mpeg2enc/synchrolib.c	Wed Apr 25 11:22:30 2001
@@ -60,14 +60,14 @@
 }
 
 
-void semaphore_init( semaphore_t *sema, int init_count )
+void mj_semaphore_init( mj_semaphore_t *sema, int init_count )
 {
 	pthread_mutex_init( &sema->mutex, NULL );
 	pthread_cond_init( &sema->raised, NULL );
 	sema->count = init_count;
 }
 
-void semaphore_wait( semaphore_t *sema)
+void mj_semaphore_wait( mj_semaphore_t *sema)
 {
 	pthread_mutex_lock( &sema->mutex );
 	while( sema->count == 0 )
@@ -78,7 +78,7 @@
 	pthread_mutex_unlock( &sema->mutex );
 }
 
-void semaphore_signal( semaphore_t *sema, int count )
+void mj_semaphore_signal( mj_semaphore_t *sema, int count )
 {
 	pthread_mutex_lock( &sema->mutex );
 	sema->count += count;
diff -r -u mjpegtools-1.3b4-orig/mpeg2enc/synchrolib.h mjpegtools-1.3b4-osx/mpeg2enc/synchrolib.h
--- mjpegtools-1.3b4-orig/mpeg2enc/synchrolib.h	Sun Mar 18 00:18:09 2001
+++ mjpegtools-1.3b4-osx/mpeg2enc/synchrolib.h	Wed Apr 25 11:22:30 2001
@@ -44,7 +44,7 @@
 	pthread_mutex_t mutex;
 	pthread_cond_t raised;
 	volatile int count;
-} semaphore_t;
+} mj_semaphore_t;
 
 
 
@@ -61,11 +61,11 @@
 void sync_guard_update( sync_guard_t *guard, int predicate );
 
 
-void semaphore_init( semaphore_t *sema, int init_count );
+void mj_semaphore_init( mj_semaphore_t *sema, int init_count );
 
-void semaphore_wait( semaphore_t *sema);
+void mj_semaphore_wait( mj_semaphore_t *sema);
 
-void semaphore_signal( semaphore_t *sema, int count );
+void mj_semaphore_signal( mj_semaphore_t *sema, int count );
 
 
 #endif