mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
rename macstrerror to PyMac_StrError; no EINTR test in CW
This commit is contained in:
parent
8a1e8eb62f
commit
e9fbc0992c
1 changed files with 13 additions and 8 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
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);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue