summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-03-04 22:35:14 (GMT)
committerGuido van Rossum <guido@python.org>1995-03-04 22:35:14 (GMT)
commitd5f53857dc58f69f6a79a7590de6c97d81fd5429 (patch)
treeac943453f1ac255316bc684cda66d7584e8560ef /Mac
parentcfa00ea19a162c7831f984ec86c758bc148b808a (diff)
downloadcpython-d5f53857dc58f69f6a79a7590de6c97d81fd5429.zip
cpython-d5f53857dc58f69f6a79a7590de6c97d81fd5429.tar.gz
cpython-d5f53857dc58f69f6a79a7590de6c97d81fd5429.tar.bz2
include macglue.h so we can use HAVE_UNIVERSAL_HEADERS;
and correct sens of PyMac_Idle() test. But should'nt this raise KeyboardInterrupt instead of silently returning?
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Unsupported/mactcp/macdnrmodule.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/Mac/Unsupported/mactcp/macdnrmodule.c b/Mac/Unsupported/mactcp/macdnrmodule.c
index 114ee3c..ac42222 100644
--- a/Mac/Unsupported/mactcp/macdnrmodule.c
+++ b/Mac/Unsupported/mactcp/macdnrmodule.c
@@ -1,6 +1,6 @@
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
@@ -25,10 +25,11 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "allobjects.h"
#include "modsupport.h" /* For getargs() etc. */
+#include "macglue.h"
#include <AddressXlation.h>
#include <Desk.h>
-#ifndef __MWERKS__
+#ifndef HAVE_UNIVERSAL_HEADERS
#define ResultUPP ResultProcPtr
#define NewResultProc(x) (x)
/* The '2' has move in this name... */
@@ -76,7 +77,7 @@ static int dnrwait(self)
dnrrobject *self;
{
while ( self->waiting ) {
- if ( !PyMac_Idle() )
+ if ( PyMac_Idle() )
return 0;
}
return 1;
@@ -90,6 +91,7 @@ dnrr_wait(self, args)
if (!newgetargs(args, ""))
return NULL;
if ( !dnrwait(self) ) {
+ /* XXX An interrupt is pending -- is this correct? */
INCREF(None);
return None;
}
@@ -194,6 +196,7 @@ dnrr_getattr(self, name)
err_clear();
if ( self->waiting )
if ( !dnrwait(self) ) {
+ /* XXX An interrupt is pending -- is this correct? */
err_setstr(ErrorObject, "Resolver busy");
return NULL;
}