changes for MPW

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 6c377dc4140ba06ef770f9ecff20d24fffa9cb92..d1c73069c5dc5e50babc5f31f7996270dac0b063 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1072,7 +1072,7 @@ static sequence_methods array_as_sequence = {
        (intintobjargproc)array_ass_slice,      /*sq_ass_slice*/
 };
 
-static typeobject Arraytype = {
+statichere typeobject Arraytype = {
        OB_HEAD_INIT(&Typetype)
        0,
        "array",

diff --git a/Modules/audioop.c b/Modules/audioop.c
index f866e98941c1ebef24c7be496e54c4f1b4df6409..899bbc62b1b37ac4f148f76e2f402a4144f3b88c 100644 (file)
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -35,7 +35,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 #endif
 
-#include <math.h>
+#include "mymath.h"
 
 /* Code shamelessly stolen from sox,
 ** (c) Craig Reese, Joe Campbell and Jeff Poskanzer 1989 */

diff --git a/Modules/md5module.c b/Modules/md5module.c
index bb98cc229d280a1d0b63458ec74129d1f4661eee..f3b86ed040c366874bf6efb42c56506f6934bcc2 100644 (file)
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -141,7 +141,7 @@ md5_getattr(self, name)
        return findmethod(md5_methods, (object *)self, name);
 }
 
-static typeobject MD5type = {
+statichere typeobject MD5type = {
        OB_HEAD_INIT(&Typetype)
        0,                      /*ob_size*/
        "md5",                  /*tp_name*/

diff --git a/Modules/rotormodule.c b/Modules/rotormodule.c
index 60d9257179824a3a26831e611ce3728717583266..6988f881a515c631ba82df89592154e09bcaa314 100644 (file)
--- a/Modules/rotormodule.c
+++ b/Modules/rotormodule.c
@@ -57,7 +57,7 @@ NOTE: you MUST use the SAME key in rotor.newrotor()
 
 #include "Python.h"
 
-#include <math.h>
+#include "mymath.h"
 
 #define TRUE   1
 #define FALSE  0
@@ -755,7 +755,7 @@ PyRotor_GetAttr(s, name)
        return Py_FindMethod(PyRotor_Methods, (PyObject * ) s, name);
 }
 
-static PyTypeObject PyRotor_Type = {
+statichere PyTypeObject PyRotor_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
        "rotor",                        /*tp_name*/

diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c
index b256695bb4d786467c40ed7717397c8d22fefeae..675b959b7b9ce4bdd69ac2d75b4890f4b640acca 100644 (file)
--- a/Modules/stdwinmodule.c
+++ b/Modules/stdwinmodule.c
@@ -1141,7 +1141,7 @@ text_setattr(tp, name, v)
                return dictinsert(tp->t_attr, name, v);
 }
 
-static typeobject Texttype = {
+statichere typeobject Texttype = {
        OB_HEAD_INIT(&Typetype)
        0,                      /*ob_size*/
        "textedit",             /*tp_name*/
@@ -1348,7 +1348,7 @@ menu_setattr(mp, name, v)
                return dictinsert(mp->m_attr, name, v);
 }
 
-static typeobject Menutype = {
+statichere typeobject Menutype = {
        OB_HEAD_INIT(&Typetype)
        0,                      /*ob_size*/
        "menu",                 /*tp_name*/
@@ -1505,7 +1505,7 @@ bitmap_setattr(bp, name, v)
                return dictinsert(bp->b_attr, name, v);
 }
 
-static typeobject Bitmaptype = {
+statichere typeobject Bitmaptype = {
        OB_HEAD_INIT(&Typetype)
        0,                      /*ob_size*/
        "bitmap",                       /*tp_name*/
@@ -1929,7 +1929,7 @@ window_setattr(wp, name, v)
                return dictinsert(wp->w_attr, name, v);
 }
 
-static typeobject Windowtype = {
+statichere typeobject Windowtype = {
        OB_HEAD_INIT(&Typetype)
        0,                      /*ob_size*/
        "window",               /*tp_name*/

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 0702f276c5be3581f2718ec80f991e0116ef1449..90a10eb8a0d9ac48c10b2d3cb1d35703570c4ab6 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -336,8 +336,12 @@ floattime()
    set an exception; else return 0. */
 
 static int
+#ifdef MPW
+floatsleep(double secs)
+#else
 floatsleep(secs)
        double secs;
+#endif /* MPW */
 {
 #ifdef HAVE_SELECT
        struct timeval t;