A few missing casts (Richard Neitzel).

Don't append Unix paths on a Mac (Jack Jansen).

diff --git a/Tools/modulator/Templates/module_tail b/Tools/modulator/Templates/module_tail
index 6ee7645ff4213db5e6b46a28807355a1701b9921..59cc50b6c0c113a06561e47f56a9d465dc37f1a2 100644 (file)
--- a/Tools/modulator/Templates/module_tail
+++ b/Tools/modulator/Templates/module_tail
@@ -3,7 +3,7 @@
 
 static struct PyMethodDef $abbrev$_methods[] = {
        $methodlist$
-       {NULL,          NULL}           /* sentinel */
+       {NULL,   (PyCFunction)NULL, 0, NULL}            /* sentinel */
 };
 
 

diff --git a/Tools/modulator/genmodule.py b/Tools/modulator/genmodule.py
index bdfe350baadc13e9387ad96f0bb7fc9986b37f5a..e5c69bfdcf280085e77139d12abae2ab20953f43 100755 (executable)
--- a/Tools/modulator/genmodule.py
+++ b/Tools/modulator/genmodule.py
@@ -81,8 +81,9 @@ class module(writer):
        for fn in self.methodlist:
            self.method = fn
            self.addcode('module_method', fp)
-           new_ml = new_ml + ('{"%s",\t%s_%s,\t1,\t%s_%s__doc__},\n'
-                              %(fn, self.abbrev, fn, self.abbrev, fn))
+           new_ml = new_ml + (
+                     '{"%s",\t(PyCFunction)%s_%s,\tMETH_VARARGS,\t%s_%s__doc__},\n'
+                     %(fn, self.abbrev, fn, self.abbrev, fn))
        self.methodlist = new_ml
        self.addcode('module_tail', fp)
 
@@ -107,8 +108,9 @@ class object(writer):
        for fn in self.methodlist:
            self.method = fn
            self.addcode('object_method', fp)
-           new_ml = new_ml + ('{"%s",\t%s_%s,\t1,\t%s_%s__doc__},\n'
-                              %(fn, self.abbrev, fn, self.abbrev, fn))
+           new_ml = new_ml + (
+                     '{"%s",\t(PyCFunction)%s_%s,\tMETH_VARARGS,\t%s_%s__doc__},\n'
+                     %(fn, self.abbrev, fn, self.abbrev, fn))
        self.methodlist = new_ml
        self.addcode('object_mlist', fp)
 

diff --git a/Tools/modulator/modulator.py b/Tools/modulator/modulator.py
index dd1ade54a093183d45ee0bb182fe0cea05e52cae..02ad80d572c1433ddabb7cc5ed173e9391262b3f 100755 (executable)
--- a/Tools/modulator/modulator.py
+++ b/Tools/modulator/modulator.py
@@ -17,7 +17,8 @@
 #
 
 import sys, os
-sys.path.append(os.path.join(os.environ['HOME'], 'src/python/Tools/modulator'))
+if os.name <> 'mac':
+       sys.path.append(os.path.join(os.environ['HOME'], 'src/python/Tools/modulator'))
 
 from Tkinter import *
 from Tkextra import *