--- a/src/video/macdsp/SDL_dspvideo.c	Thu May 11 03:19:03 2006 +0000
+++ b/src/video/macdsp/SDL_dspvideo.c	Thu May 11 03:21:54 2006 +0000
@@ -682,7 +682,7 @@
   if (dialog == NULL)
 	 return (0);
   
-#if TARGET_API_CARBON
+#if TARGET_API_MAC_CARBON
   SetPort (GetDialogPort(dialog));
 #else
   SetPort ((WindowPtr) dialog);

--- a/src/video/macrom/SDL_romvideo.c	Thu May 11 03:19:03 2006 +0000
+++ b/src/video/macrom/SDL_romvideo.c	Thu May 11 03:21:54 2006 +0000
@@ -35,6 +35,7 @@
 #include <Movies.h>
 #endif
 #else
+#include <Quickdraw.h>
 #include <LowMem.h>
 #include <Gestalt.h>
 #include <Devices.h>
@@ -637,12 +638,12 @@
 	SetPortWindowPort(SDL_Window);
 	thePort = GetWindowPort(SDL_Window);
 	memworld = (GWorldPtr)GetWRefCon(SDL_Window);
-#if TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_CARBON && ACCESSOR_CALLS_ARE_FUNCTIONS
 	memBits = GetPortBitMapForCopyBits((CGrafPtr) memworld);
 #else
 	memBits = &((GrafPtr)memworld)->portBits;
 #endif
-#if TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_CARBON && ACCESSOR_CALLS_ARE_FUNCTIONS
 	winBits = GetPortBitMapForCopyBits(thePort);
 #else
 	winBits = &SDL_Window->portBits;