mirror of https://github.com/python/cpython
Getting rid of code dependent on GUSI or the MetroWerks compiler.
This commit is contained in:
parent
bc2fbc74ed
commit
4bae2d5e46
|
@ -34,7 +34,7 @@ This software comes with no warranty. Use at your own risk.
|
|||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#if defined(__APPLE__) || defined(__MWERKS__)
|
||||
#if defined(__APPLE__)
|
||||
#include "macglue.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -3,11 +3,6 @@
|
|||
|
||||
#include "Python.h"
|
||||
|
||||
/* Mac with GUSI has more errors than those in errno.h */
|
||||
#ifdef USE_GUSI
|
||||
#include <sys/errno.h>
|
||||
#endif
|
||||
|
||||
/* Windows socket errors (WSA*) */
|
||||
#ifdef MS_WINDOWS
|
||||
#include <winsock.h>
|
||||
|
|
|
@ -1739,11 +1739,6 @@ sock_makefile(PySocketSockObject *s, PyObject *args)
|
|||
SOCKETCLOSE(fd);
|
||||
return s->errorhandler();
|
||||
}
|
||||
#ifdef USE_GUSI2
|
||||
/* Workaround for bug in Metrowerks MSL vs. GUSI I/O library */
|
||||
if (strchr(mode, 'b') != NULL)
|
||||
bufsize = 0;
|
||||
#endif
|
||||
f = PyFile_FromFile(fp, "<socket>", mode, fclose);
|
||||
if (f != NULL)
|
||||
PyFile_SetBufSize(f, bufsize);
|
||||
|
|
|
@ -41,15 +41,6 @@ static PyObject *StructError;
|
|||
|
||||
/* Define various structs to figure out the alignments of types */
|
||||
|
||||
#ifdef __MWERKS__
|
||||
/*
|
||||
** XXXX We have a problem here. There are no unique alignment rules
|
||||
** on the PowerPC mac.
|
||||
*/
|
||||
#ifdef __powerc
|
||||
#pragma options align=mac68k
|
||||
#endif
|
||||
#endif /* __MWERKS__ */
|
||||
|
||||
typedef struct { char c; short x; } st_short;
|
||||
typedef struct { char c; int x; } st_int;
|
||||
|
|
|
@ -21,17 +21,6 @@
|
|||
#include <windows.h>
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#ifdef macintosh
|
||||
#ifdef USE_GUSI
|
||||
#define HAVE_FTRUNCATE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
/* Mwerks fopen() doesn't always set errno */
|
||||
#define NO_FOPEN_ERRNO
|
||||
#endif
|
||||
|
||||
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
@ -209,18 +198,6 @@ open_the_file(PyFileObject *f, char *name, char *mode)
|
|||
}
|
||||
}
|
||||
if (f->f_fp == NULL) {
|
||||
#ifdef NO_FOPEN_ERRNO
|
||||
/* Metroworks only, wich does not always sets errno */
|
||||
if (errno == 0) {
|
||||
PyObject *v;
|
||||
v = Py_BuildValue("(is)", 0, "Cannot open file");
|
||||
if (v != NULL) {
|
||||
PyErr_SetObject(PyExc_IOError, v);
|
||||
Py_DECREF(v);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
#ifdef _MSC_VER
|
||||
/* MSVC 6 (Microsoft) leaves errno at 0 for bad mode strings,
|
||||
* across all Windows flavors. When it sets EINVAL varies
|
||||
|
@ -739,12 +716,7 @@ new_buffersize(PyFileObject *f, size_t currentsize)
|
|||
works. We can't use the lseek() value either, because we
|
||||
need to take the amount of buffered data into account.
|
||||
(Yet another reason why stdio stinks. :-) */
|
||||
#ifdef USE_GUSI2
|
||||
pos = lseek(fileno(f->f_fp), 1L, SEEK_CUR);
|
||||
pos = lseek(fileno(f->f_fp), -1L, SEEK_CUR);
|
||||
#else
|
||||
pos = lseek(fileno(f->f_fp), 0L, SEEK_CUR);
|
||||
#endif
|
||||
if (pos >= 0) {
|
||||
pos = ftell(f->f_fp);
|
||||
}
|
||||
|
|
|
@ -45,10 +45,6 @@ extern char *getenv(const char *);
|
|||
#define SUN_LWP
|
||||
#endif
|
||||
|
||||
#if defined(__MWERKS__) && !defined(__BEOS__)
|
||||
#define _POSIX_THREADS
|
||||
#endif
|
||||
|
||||
#endif /* _POSIX_THREADS */
|
||||
|
||||
|
||||
|
|
|
@ -68,14 +68,6 @@
|
|||
|
||||
#endif
|
||||
|
||||
#ifdef USE_GUSI
|
||||
/* The Macintosh GUSI I/O library sets the stackspace to
|
||||
** 20KB, much too low. We up it to 64K.
|
||||
*/
|
||||
#define THREAD_STACK_SIZE 0x10000
|
||||
#endif
|
||||
|
||||
|
||||
/* set default attribute object for different versions */
|
||||
|
||||
#if defined(PY_PTHREAD_D4) || defined(PY_PTHREAD_D7)
|
||||
|
|
Loading…
Reference in New Issue