--- a/src/pt-mat.cc
+++ b/src/pt-mat.cc
@@ -377,7 +377,7 @@
        p != row.end ();
        p++)
     {
-      OCTAVE_QUIT;
+      octave_quit ();
 
       tree_expression *elt = *p;
 
@@ -393,7 +393,7 @@
 
 	      for (octave_idx_type i = 0; i < tlst.length (); i++)
 		{
-		  OCTAVE_QUIT;
+		  octave_quit ();
 
 		  if (! do_init_element (elt, tlst(i), first_elem))
 		    goto done;
@@ -523,7 +523,7 @@
 
   for (tree_matrix::const_iterator p = tm.begin (); p != tm.end (); p++)
     {
-      OCTAVE_QUIT;
+      octave_quit ();
 
       tree_argument_list *elt = *p;
 
@@ -568,7 +568,7 @@
     {
       for (iterator p = begin (); p != end (); p++)
 	{
-	  OCTAVE_QUIT;
+	  octave_quit ();
 
 	  tm_row_const elt = *p;
 
@@ -676,7 +676,7 @@
 {
   for (const_iterator p = begin (); p != end (); p++)
     {
-      OCTAVE_QUIT;
+      octave_quit ();
 
       tree_argument_list *elt = *p;
 
@@ -692,7 +692,7 @@
 {
   for (const_iterator p = begin (); p != end (); p++)
     {
-      OCTAVE_QUIT;
+      octave_quit ();
 
       tree_argument_list *elt = *p;
 
@@ -739,7 +739,7 @@
            q != row.end ();
            q++)
         {
-          OCTAVE_QUIT;
+          octave_quit ();
 
           TYPE ra = octave_value_extract<TYPE> (*q);
 
@@ -826,7 +826,7 @@
 	  int j = 0;
 	  for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
 	    {
-	      OCTAVE_QUIT;
+	      octave_quit ();
 
 	      tm_row_const row = *p;
 
@@ -978,14 +978,14 @@
 	    {
 	      for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
 		{
-		  OCTAVE_QUIT;
+		  octave_quit ();
 
 		  tm_row_const row = *p;
 
 		  for (tm_row_const::iterator q = row.begin (); 
 		       q != row.end (); q++)
 		    {
-		      OCTAVE_QUIT;
+		      octave_quit ();
 
 		      ctmp = *q;
 
@@ -1012,7 +1012,7 @@
 
 	      for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
 		{
-		  OCTAVE_QUIT;
+		  octave_quit ();
 
 		  tm_row_const row = *p;
 
@@ -1020,7 +1020,7 @@
 		       q != row.end ();
 		       q++)
 		    {
-		      OCTAVE_QUIT;
+		      octave_quit ();
 
 		      octave_value elt = *q;