Changes to fix compilation problems on a Mac after extensive changes to improve NoteTrack display.

lib-src/libscorealign/comp_chroma.cpp

@@ -9,6 +9,11 @@
 #include  "comp_chroma.h"
 using namespace std;
 
+#ifdef min
+#undef min
+#endif
+#define min(x,y) ((x)<(y)?(x):(y))
+
 #define SILENCE_DISTANCE 16.0
 
 /*				GEN_DIST

lib-src/libscorealign/hillclimb.cpp

@@ -28,7 +28,7 @@
 
 
 #include "stdio.h"
-#include "malloc.h"
+#include <stdlib.h>
 #include "sautils.h"
 #include "hillclimb.h"
 

lib-src/portmidi/pm_mac/readbinaryplist.c

@@ -78,7 +78,7 @@ memory requested or calls longjmp, so callers don't have to check.
 #include <stdio.h>
 #include <sys/stat.h>
 #include "readbinaryplist.h"
-#include "Folders.h"
+#include <Carbon/Carbon.h>
 
 #define NO 0
 #define YES 1