Trying again to check it in. Changes to:
- Use Universal Headers as input
- Change addpack calls to not depend on Guido's disklayout
- Checkge testprograms to use new names for some functions
diff --git a/Mac/Modules/win/Winmodule.c b/Mac/Modules/win/Winmodule.c
index fc89803..7d6de73 100644
--- a/Mac/Modules/win/Winmodule.c
+++ b/Mac/Modules/win/Winmodule.c
@@ -346,7 +346,7 @@
 	PyObject *_res = NULL;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	ClipAbove((WindowPeek)(_self->ob_itself));
+	ClipAbove(_self->ob_itself);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
@@ -359,7 +359,7 @@
 	PyObject *_res = NULL;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	SaveOld((WindowPeek)(_self->ob_itself));
+	SaveOld(_self->ob_itself);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
@@ -374,7 +374,7 @@
 	if (!PyArg_ParseTuple(_args, "b",
 	                      &update))
 		return NULL;
-	DrawNew((WindowPeek)(_self->ob_itself),
+	DrawNew(_self->ob_itself,
 	        update);
 	Py_INCREF(Py_None);
 	_res = Py_None;
@@ -388,7 +388,7 @@
 	PyObject *_res = NULL;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	CalcVis((WindowPeek)(_self->ob_itself));
+	CalcVis(_self->ob_itself);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
@@ -871,4 +871,3 @@
 
 /* ========================= End module Win ========================= */
 
-