Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 781-792)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21

1 files changed, 2 insertions, 2 deletions

diff --git a/src/macgui.h b/src/macgui.h
index 1348fe479cb..990765593e1 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -71,7 +71,7 @@ typedef unsigned long Time;
 #undef Z
 #define Z (current_buffer->text->z)
 #else /* not HAVE_CARBON */
-#include <QuickDraw.h>          /* for WindowPtr */
+#include <QuickDraw.h>          /* for WindowRef */
 #include <QDOffscreen.h>        /* for GWorldPtr */
 #include <Appearance.h>         /* for ThemeCursor */
 #include <Windows.h>
@@ -117,7 +117,7 @@ typedef unsigned long Time;
 #endif
 #endif
 
-typedef WindowPtr Window;
+typedef WindowRef Window;
 typedef GWorldPtr Pixmap;
 
 #define Cursor ThemeCursor