summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Include/pyconfig.h2
-rw-r--r--Mac/Modules/macmodule.c20
-rw-r--r--Mac/Python/macgetcompiler.c4
3 files changed, 1 insertions, 25 deletions
diff --git a/Mac/Include/pyconfig.h b/Mac/Include/pyconfig.h
index ac4e15a..15bef5a 100644
--- a/Mac/Include/pyconfig.h
+++ b/Mac/Include/pyconfig.h
@@ -36,7 +36,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define macintosh
#endif
-#if defined(USE_GUSI1) || defined(USE_GUSI2)
+#if defined(USE_GUSI2)
#define USE_GUSI
#endif
diff --git a/Mac/Modules/macmodule.c b/Mac/Modules/macmodule.c
index 93dfaee..8b3bcc5 100644
--- a/Mac/Modules/macmodule.c
+++ b/Mac/Modules/macmodule.c
@@ -46,9 +46,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#undef S_IWRITE
#undef S_IEXEC
-#ifdef USE_GUSI1
-#include <GUSI.h>
-#endif /* USE_GUSI1 */
#include <sys/types.h>
#include <sys/stat.h>
#else /* USE_GUSI */
@@ -181,17 +178,7 @@ mac_chdir(self, args)
PyObject *self;
PyObject *args;
{
-#ifdef USE_GUSI1
- PyObject *rv;
-
- /* Change MacOS's idea of wd too */
- rv = mac_1str(args, chdir);
- PyMac_FixGUSIcd();
- return rv;
-#else
return mac_1str(args, chdir);
-#endif
-
}
static PyObject *
@@ -205,11 +192,8 @@ mac_close(self, args)
Py_BEGIN_ALLOW_THREADS
res = close(fd);
Py_END_ALLOW_THREADS
-#ifndef USE_GUSI1
- /* GUSI gives surious errors here? */
if (res < 0)
return mac_error();
-#endif
Py_INCREF(Py_None);
return Py_None;
}
@@ -385,11 +369,7 @@ mac_mkdir(self, args)
if (!PyArg_ParseTuple(args, "s|i", &path, &mode))
return NULL;
Py_BEGIN_ALLOW_THREADS
-#ifdef USE_GUSI1
- res = mkdir(path);
-#else
res = mkdir(path, mode);
-#endif
Py_END_ALLOW_THREADS
if (res < 0)
return mac_error();
diff --git a/Mac/Python/macgetcompiler.c b/Mac/Python/macgetcompiler.c
index eb9c3c4..46c0bf3 100644
--- a/Mac/Python/macgetcompiler.c
+++ b/Mac/Python/macgetcompiler.c
@@ -35,15 +35,11 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Python.h"
#ifdef __MWERKS__
-#ifdef USE_GUSI1
-#define HASGUSI " GUSI1"
-#else
#ifdef USE_GUSI2
#define HASGUSI " GUSI2"
#else
#define HASGUSI ""
#endif
-#endif
#ifdef WITH_THREAD
#define HASTHREAD " THREADS"