diff options
| author | Miles Bader | 2007-06-11 00:58:11 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-06-11 00:58:11 +0000 |
| commit | fb9a13e3dca1685b81fcf4d345133fb34911594d (patch) | |
| tree | 181797239f450c33ca8fd0d4d18686bbfc68859d /src/macgui.h | |
| parent | 4d3e23e3e8273e820d69e0ecca0f409c4b9a179e (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-fb9a13e3dca1685b81fcf4d345133fb34911594d.tar.gz emacs-fb9a13e3dca1685b81fcf4d345133fb34911594d.zip | |
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--unicode--0--patch-219
Diffstat (limited to 'src/macgui.h')
| -rw-r--r-- | src/macgui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macgui.h b/src/macgui.h index 3c37b86e22a..34a3f905487 100644 --- a/src/macgui.h +++ b/src/macgui.h | |||
| @@ -71,7 +71,7 @@ typedef unsigned long Time; | |||
| 71 | #undef Z | 71 | #undef Z |
| 72 | #define Z (current_buffer->text->z) | 72 | #define Z (current_buffer->text->z) |
| 73 | #else /* not HAVE_CARBON */ | 73 | #else /* not HAVE_CARBON */ |
| 74 | #include <QuickDraw.h> /* for WindowPtr */ | 74 | #include <QuickDraw.h> /* for WindowRef */ |
| 75 | #include <QDOffscreen.h> /* for GWorldPtr */ | 75 | #include <QDOffscreen.h> /* for GWorldPtr */ |
| 76 | #include <Appearance.h> /* for ThemeCursor */ | 76 | #include <Appearance.h> /* for ThemeCursor */ |
| 77 | #include <Windows.h> | 77 | #include <Windows.h> |
| @@ -119,7 +119,7 @@ typedef unsigned long Time; | |||
| 119 | #endif | 119 | #endif |
| 120 | #endif | 120 | #endif |
| 121 | 121 | ||
| 122 | typedef WindowPtr Window; | 122 | typedef WindowRef Window; |
| 123 | typedef GWorldPtr Pixmap; | 123 | typedef GWorldPtr Pixmap; |
| 124 | 124 | ||
| 125 | #define Cursor ThemeCursor | 125 | #define Cursor ThemeCursor |