Call the gsapi polling function from the Macintosh gp_check_interrupts

function. Partial fix for Bug 686810 "CHECK_INTERRUPTS should allow
shorter worst-case abort".

git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@3846 a1074d23-0009-0410-80fe-cf8c14f379e6

1 files changed, 20 insertions, 8 deletions

diff --git a/gs/src/gp_mac.c b/gs/src/gp_mac.c
index 927db1761..7023ca9d3 100644
--- a/gs/src/gp_mac.c
+++ b/gs/src/gp_mac.c
@@ -334,16 +334,28 @@ gp_getenv_display(void)
 int gp_check_interrupts(void)
 {
 	static unsigned long	lastYieldTicks = 0;
+	int iRetVal = 0;
 	
 	if ((TickCount() - lastYieldTicks) > 2) {
-		lastYieldTicks = TickCount();
-		/* the hwnd parameter which is submitted in gsdll_init to the DLL */
-		/* is returned in every gsdll_poll message in the count parameter */
-		if (pgsdll_callback)
-			return (*pgsdll_callback) (GSDLL_POLL, 0, (long) hwndtext);
-		else return 0;
-	} else {
-		return 0;
+	    lastYieldTicks = TickCount();
+	    if (pgsdll_callback) {
+		/* WARNING: The use of the old gsdll interface is deprecated. 
+		 * The caller should use the newer gsapi_set_poll.
+		 * If the caller needs access to "hwndtext", it should do 
+		 * this via caller_handle which is passed to poll_fn.
+		 */
+		/* the hwnd parameter which is submitted in gsdll_init 
+		 * to the DLL is returned in every gsdll_poll message 
+		 * in the count parameter
+		 */
+		iRetVal = (*pgsdll_callback)(GSDLL_POLL, 0, (long) hwndtext);
+	    } 
+	    else {
+		gs_main_instance *minst = gs_main_instance_default();
+		if (minst && minst->poll_fn)
+		    iRetVal = (*minst->poll_fn)(minst->caller_handle);
+	    }
 	}
+	return iRetVal;
 }
 #endif