Shut up many more gcc warnings.
diff --git a/Mac/Modules/res/_Resmodule.c b/Mac/Modules/res/_Resmodule.c
index 76d3bec..775e668 100644
--- a/Mac/Modules/res/_Resmodule.c
+++ b/Mac/Modules/res/_Resmodule.c
@@ -5,8 +5,12 @@
+#ifdef _WIN32
+#include "pywintoolbox.h"
+#else
#include "macglue.h"
#include "pymactoolbox.h"
+#endif
/* Macro to test whether a weak-loaded CFM function exists */
#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
@@ -394,7 +398,8 @@
{
PyObject *_res = NULL;
- return CtlObj_New((ControlHandle)_self->ob_itself);
+ _res = CtlObj_New((ControlHandle)_self->ob_itself);
+ return _res;
}
@@ -402,7 +407,8 @@
{
PyObject *_res = NULL;
- return MenuObj_New((MenuHandle)_self->ob_itself);
+ _res = MenuObj_New((MenuHandle)_self->ob_itself);
+ return _res;
}
@@ -1533,7 +1539,7 @@
return ResObj_New(itself);
}
-OptResObj_Convert(PyObject *v, Handle *p_itself)
+int OptResObj_Convert(PyObject *v, Handle *p_itself)
{
PyObject *tmp;
diff --git a/Mac/Modules/res/resedit.py b/Mac/Modules/res/resedit.py
index 1684870..fce0bd1 100644
--- a/Mac/Modules/res/resedit.py
+++ b/Mac/Modules/res/resedit.py
@@ -58,7 +58,8 @@
# Convert resources to other things.
as_xxx_body = """
-return %sObj_New((%sHandle)_self->ob_itself);
+_res = %sObj_New((%sHandle)_self->ob_itself);
+return _res;
"""
def genresconverter(longname, shortname):
diff --git a/Mac/Modules/res/ressupport.py b/Mac/Modules/res/ressupport.py
index 2a72748..f7a1f45 100644
--- a/Mac/Modules/res/ressupport.py
+++ b/Mac/Modules/res/ressupport.py
@@ -61,7 +61,7 @@
return ResObj_New(itself);
}
-OptResObj_Convert(PyObject *v, Handle *p_itself)
+int OptResObj_Convert(PyObject *v, Handle *p_itself)
{
PyObject *tmp;