Got rid of ifdefs for long-obsolete GUSI versions.
diff --git a/Include/pyport.h b/Include/pyport.h
index b311bd8..86bbab2 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -117,13 +117,6 @@
#include <sys/select.h>
-#else /* !HAVE_SYS_SELECT_H */
-
-#ifdef USE_GUSI1
-/* If we don't have sys/select the definition may be in unistd.h */
-#include <GUSI.h>
-#endif
-
#endif /* !HAVE_SYS_SELECT_H */
/*******************************
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 @@
#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 @@
#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 @@
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 @@
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 @@
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 @@
#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"
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 74e28f2..4366b17 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -149,9 +149,7 @@
# include <netdb.h>
typedef size_t socklen_t;
# else
-# ifndef USE_GUSI1
# include <arpa/inet.h>
-# endif
# endif
# ifndef RISCOS
@@ -181,11 +179,6 @@
# define O_NDELAY O_NONBLOCK /* For QNX only? */
#endif
-#ifdef USE_GUSI1
-/* fdopen() isn't declared in stdio.h (sigh) */
-# include <GUSI.h>
-#endif
-
#include "addrinfo.h"
#ifndef HAVE_INET_PTON
@@ -2332,11 +2325,7 @@
if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr)) {
return NULL;
}
-#ifdef USE_GUSI1
- packed_addr = inet_addr(ip_addr).s_addr;
-#else
packed_addr = inet_addr(ip_addr);
-#endif
if (packed_addr == INADDR_NONE) { /* invalid address */
PyErr_SetString(PySocket_Error,
@@ -3331,11 +3320,7 @@
{
if(af == AF_INET){
long packed_addr;
-#ifdef USE_GUSI1
- packed_addr = (long)inet_addr(src).s_addr;
-#else
packed_addr = inet_addr(src);
-#endif
if (packed_addr == INADDR_NONE)
return 0;
memcpy(dst, &packed_addr, 4);
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 9396826..dda2ce4 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -9,13 +9,6 @@
#ifdef macintosh
#include <time.h>
#include <OSUtils.h>
-#ifdef USE_GUSI211
-/* GUSI, the I/O library which has the time() function and such uses the
-** Mac epoch of 1904. MSL, the C library which has localtime() and so uses
-** the ANSI epoch of 1900.
-*/
-#define GUSI_TO_MSL_EPOCH (4*365*24*60*60)
-#endif /* USE_GUSI2 */
#else
#include <sys/types.h>
#endif
@@ -259,9 +252,6 @@
{
struct tm *p;
errno = 0;
-#if defined(macintosh) && defined(USE_GUSI204)
- when = when + GUSI_TO_MSL_EPOCH;
-#endif
p = function(&when);
if (p == NULL) {
#ifdef EINVAL
@@ -487,9 +477,6 @@
return NULL;
tt = (time_t)dt;
}
-#if defined(macintosh) && defined(USE_GUSI204)
- tt = tt + GUSI_TO_MSL_EPOCH;
-#endif
p = ctime(&tt);
if (p == NULL) {
PyErr_SetString(PyExc_ValueError, "unconvertible time");
@@ -526,9 +513,6 @@
"mktime argument out of range");
return NULL;
}
-#if defined(macintosh) && defined(USE_GUSI211)
- tt = tt - GUSI_TO_MSL_EPOCH;
-#endif
return PyFloat_FromDouble((double)tt);
}
diff --git a/Python/import.c b/Python/import.c
index 1a06153..3c87506 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1139,9 +1139,6 @@
#elif defined(macintosh)
#include <TextUtils.h>
-#ifdef USE_GUSI1
-#include "TFileSpec.h" /* for Path2FSSpec() */
-#endif
#elif defined(__MACH__) && defined(__APPLE__) && defined(HAVE_DIRENT_H)
#include <sys/types.h>
@@ -1215,25 +1212,7 @@
if (Py_GETENV("PYTHONCASEOK") != NULL)
return 1;
-#ifndef USE_GUSI1
err = FSMakeFSSpec(0, 0, Pstring(buf), &fss);
-#else
- /* GUSI's Path2FSSpec() resolves all possible aliases nicely on
- the way, which is fine for all directories, but here we need
- the original name of the alias file (say, Dlg.ppc.slb, not
- toolboxmodules.ppc.slb). */
- char *colon;
- err = Path2FSSpec(buf, &fss);
- if (err == noErr) {
- colon = strrchr(buf, ':'); /* find filename */
- if (colon != NULL)
- err = FSMakeFSSpec(fss.vRefNum, fss.parID,
- Pstring(colon+1), &fss);
- else
- err = FSMakeFSSpec(fss.vRefNum, fss.parID,
- fss.name, &fss);
- }
-#endif
if (err) {
PyErr_Format(PyExc_NameError,
"Can't find file for module %.100s\n(filename %.300s)",