summaryrefslogtreecommitdiffstats
path: root/Python/errors.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-02-18 14:52:19 (GMT)
committerGuido van Rossum <guido@python.org>1995-02-18 14:52:19 (GMT)
commite9fbc0992cc1ca5badce8d8676a0b240be56d652 (patch)
tree878ae2b2ef7e8cb61101e5500ccb593b62c69347 /Python/errors.c
parent8a1e8eb62fc89814a942f6ba59cac0ac32cd9fe5 (diff)
downloadcpython-e9fbc0992cc1ca5badce8d8676a0b240be56d652.zip
cpython-e9fbc0992cc1ca5badce8d8676a0b240be56d652.tar.gz
cpython-e9fbc0992cc1ca5badce8d8676a0b240be56d652.tar.bz2
rename macstrerror to PyMac_StrError; no EINTR test in CW
Diffstat (limited to 'Python/errors.c')
-rw-r--r--Python/errors.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/Python/errors.c b/Python/errors.c
index 6757842..619c3ce 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -60,17 +60,20 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <errno.h>
-#ifndef NT
+#ifdef __CFM68K__
+#pragma lib_export on
+#endif
+
#ifdef macintosh
-/*
-** For the mac, there's a function macstrerror in macosmodule.c. We can't
-** call it strerror(), though, since that is already defined (for Think C)
-** in ANSI
+/* Replace strerror with a Mac specific routine.
+ XXX PROBLEM: some positive errors have a meaning for MacOS,
+ but some library routines set Unix error numbers...
*/
#undef strerror
-#define strerror macstrerror
-#include "macdefs.h" /* For CW to find EINTR */
-#endif /* !macintosh */
+#define strerror PyMac_StrError
+#endif /* macintosh */
+
+#ifndef NT
extern char *strerror PROTO((int));
#endif /* !NT */
@@ -175,8 +178,10 @@ err_errno(exc)
{
object *v;
int i = errno;
+#ifdef EINTR
if (i == EINTR && sigcheck())
return NULL;
+#endif
v = mkvalue("(is)", i, strerror(i));
if (v != NULL) {
err_setval(exc, v);