- Changed the m# format for PyArg_ParseTuple back to s#

- c2pstr has moved to a different include file

5 files changed, 7 insertions, 7 deletions

diff --git a/Mac/Modules/ctbmodule.c b/Mac/Modules/ctbmodule.c
index 6f0923b..907b7bb 100644
--- a/Mac/Modules/ctbmodule.c
+++ b/Mac/Modules/ctbmodule.c
@@ -298,7 +298,7 @@ ctbcm_write(self, args)
 	char *buf;
 	ConnectionCompletionUPP cb_upp = NewConnectionCompletionProc(ctbcm_ctbcallback);
 	
-	if (!PyArg_Parse(args, "(m#ili)", &buf, &ilen, &chan, &timeout, &flags))
+	if (!PyArg_Parse(args, "(s#ili)", &buf, &ilen, &chan, &timeout, &flags))
 		return NULL;
 	len = ilen;
 	if ((err=CMWrite(self->hdl, (Ptr)buf, &len, (CMChannel)chan,
diff --git a/Mac/Modules/macfsmodule.c b/Mac/Modules/macfsmodule.c
index 1a43d16..5bd2ce5 100644
--- a/Mac/Modules/macfsmodule.c
+++ b/Mac/Modules/macfsmodule.c
@@ -824,7 +824,7 @@ mfs_RawFSSpec(self, args)
 	FSSpec *fssp;
 	int size;
 
-	if (!PyArg_ParseTuple(args, "m#", &fssp, &size))
+	if (!PyArg_ParseTuple(args, "s#", &fssp, &size))
 		return NULL;
 	if ( size != sizeof(FSSpec) ) {
 		PyErr_SetString(PyExc_TypeError, "Incorrect size for FSSpec record");
@@ -842,7 +842,7 @@ mfs_RawAlias(self, args)
 	Handle h;
 	int size;
 
-	if (!PyArg_ParseTuple(args, "m#", &dataptr, &size))
+	if (!PyArg_ParseTuple(args, "s#", &dataptr, &size))
 		return NULL;
 	h = NewHandle(size);
 	if ( h == NULL ) {
diff --git a/Mac/Modules/macmodule.c b/Mac/Modules/macmodule.c
index 8de3c91..49c0f8b 100644
--- a/Mac/Modules/macmodule.c
+++ b/Mac/Modules/macmodule.c
@@ -567,7 +567,7 @@ mac_write(self, args)
 {
 	int fd, size;
 	char *buffer;
-	if (!PyArg_Parse(args, "(im#)", &fd, &buffer, &size))
+	if (!PyArg_Parse(args, "(is#)", &fd, &buffer, &size))
 		return NULL;
 	Py_BEGIN_ALLOW_THREADS
 	size = write(fd, buffer, size);
diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index 90be55d..3cf11a0 100644
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -117,7 +117,7 @@ rf_write(self, args)
 		PyErr_SetString(PyExc_ValueError, "Operation on closed file");
 		return NULL;
 	}
-	if (!PyArg_ParseTuple(args, "m#", &buffer, &size))
+	if (!PyArg_ParseTuple(args, "s#", &buffer, &size))
 		return NULL;
 	err = FSWrite(self->fRefNum, &size, buffer);
 	if (err) {
diff --git a/Mac/Modules/macspeechmodule.c b/Mac/Modules/macspeechmodule.c
index 6bcc730..22fe99a 100644
--- a/Mac/Modules/macspeechmodule.c
+++ b/Mac/Modules/macspeechmodule.c
@@ -29,7 +29,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Speech.h"
 
 #ifdef __MWERKS__
-#include <Strings.h>
+#include <TextUtils.h>
 #define c2pstr C2PStr
 #define p2cstr P2CStr
 #else
@@ -150,7 +150,7 @@ sc_SpeakText(self, args)
 	char *str;
 	int len;
 	
-	if (!PyArg_Parse(args, "m#", &str, &len))
+	if (!PyArg_Parse(args, "s#", &str, &len))
 		return NULL;
 	if ( self->curtext ) {
 		StopSpeech(self->chan);