Kaydet (Commit) e9fbc099 authored tarafından Guido van Rossum's avatar Guido van Rossum

rename macstrerror to PyMac_StrError; no EINTR test in CW

üst 8a1e8eb6
...@@ -60,17 +60,20 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -60,17 +60,20 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <errno.h> #include <errno.h>
#ifndef NT #ifdef __CFM68K__
#pragma lib_export on
#endif
#ifdef macintosh #ifdef macintosh
/* /* Replace strerror with a Mac specific routine.
** For the mac, there's a function macstrerror in macosmodule.c. We can't XXX PROBLEM: some positive errors have a meaning for MacOS,
** call it strerror(), though, since that is already defined (for Think C) but some library routines set Unix error numbers...
** in ANSI
*/ */
#undef strerror #undef strerror
#define strerror macstrerror #define strerror PyMac_StrError
#include "macdefs.h" /* For CW to find EINTR */ #endif /* macintosh */
#endif /* !macintosh */
#ifndef NT
extern char *strerror PROTO((int)); extern char *strerror PROTO((int));
#endif /* !NT */ #endif /* !NT */
...@@ -175,8 +178,10 @@ err_errno(exc) ...@@ -175,8 +178,10 @@ err_errno(exc)
{ {
object *v; object *v;
int i = errno; int i = errno;
#ifdef EINTR
if (i == EINTR && sigcheck()) if (i == EINTR && sigcheck())
return NULL; return NULL;
#endif
v = mkvalue("(is)", i, strerror(i)); v = mkvalue("(is)", i, strerror(i));
if (v != NULL) { if (v != NULL) {
err_setval(exc, v); err_setval(exc, v);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment