Merge pull request #29 from ams/master

Fix random OS X non-sense.

emu/dis340.c

@@ -1,5 +1,5 @@
 #include "pdp6.h"
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 //#define JUSTTESTING
 

emu/joy.c

@@ -1,6 +1,7 @@
 #include "pdp6.h"
+#include <unistd.h>
 #include <signal.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <unistd.h>
 
 char *joy_ident = JOY_IDENT;

emu/main_panel.c

@@ -1,7 +1,7 @@
 #include "pdp6.h"
 #include <stdarg.h>
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
+#include <SDL.h>
+#include <SDL_image.h>
 #include "args.h"
 
 #include "../art/panelart.inc"

emu/threading.c

@@ -213,7 +213,11 @@ void
 threadname(char *name)
 {
 	// TODO: make portable
+#ifdef __APPLE__
+	pthread_setname_np(name);
+#else
 	pthread_setname_np(pthread_self(), name);
+#endif
 }
 
 int