Carbonize more includes

Author: nicolas-cellier-aka-nice

platforms/Mac_OS/plugins/DropPlugin/sqMacDragDrop.c

@@ -28,7 +28,7 @@ Some of this code comes from
 				Some techniques borrowed from Pete Gontier's original FinderDragPro.
 
 
-	Copyright: 	Copyright: © 1999 by Apple Computer, Inc.
+	Copyright: 	Copyright: � 1999 by Apple Computer, Inc.
 				all rights reserved.
 	
 	Disclaimer:	You may incorporate this sample code into your applications without
@@ -55,11 +55,14 @@ Some of this code comes from
 
 #include "sq.h"
 
+#if TARGET_API_MAC_CARBON
+#include <Carbon/Carbon.h>
+#else
 #include <Drag.h>
 #include <MacWindows.h>
 #include <Gestalt.h>
 #include <Quickdraw.h>
-
+#endif
 
 #include "sqVirtualMachine.h"
 #include "sqMacUnixFileInterface.h"	

platforms/Mac_OS/plugins/SecurityPlugin/sqMacSecurity.c

@@ -11,7 +11,11 @@
 #include "sqMacUIConstants.h"
 #include "FilePlugin.h"
 
-#include <Files.h> 
+#if TARGET_API_MAC_CARBON
+#include <Carbon/Carbon.h>
+#else
+#include <Files.h>
+#endif
 
 #if !defined(PATH_MAX)
 # include <sys/syslimits.h>

platforms/Mac_OS/plugins/UUIDPlugin/sqMacUUID.c

@@ -17,7 +17,12 @@
 
 extern struct VirtualMachine *interpreterProxy;
 
+#if TARGET_API_MAC_CARBON
+#include <Carbon/Carbon.h>
+#else
 #include <CFUUID.h>
+#endif
+
 int sqUUIDInit(void);
 int sqUUIDShutdown(void);
 

platforms/Mac_OS/vm/sqMacMain.c

@@ -99,7 +99,12 @@
 
 #include <unistd.h>
 #include <pthread.h>
+
+#if TARGET_API_MAC_CARBON
+#include <Carbon/Carbon.h>
+#else
 #include <Processes.h>
+#endif
 
 #if !defined(PATH_MAX)
 # include <sys/syslimits.h>

platforms/Mac_OS/vm/sqMacNSPluginUILogic2.c

@@ -9,8 +9,12 @@
  *
  */
 
-#include <Debugging.h>
+#if TARGET_API_MAC_CARBON
 #include <Carbon/Carbon.h>
+#else
+#include <Debugging.h>
+#endif
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>

platforms/Mac_OS/vm/sqMacUIEventsUniversal.c

@@ -55,7 +55,13 @@
 
 #include <pthread.h>
 #include "sqaio.h"
+
+#if TARGET_API_MAC_CARBON
+#include <Carbon/Carbon.h>
+#else
 #include <Quickdraw.h>
+#endif
+
 #include <unistd.h>
 
 enum { KeyMapSize= 32 };
@@ -264,6 +270,7 @@ ioGetNextEvent(sqInputEvent *evt)
 		if (postMessageHook)
 			postMessageHook((EventRecord *) evt->unused1);
 		free((void *) evt->unused1);
+        evt->unused1 = NULL;
 		return ioGetNextEvent(evt);
 	}
 	return true;