Merge from emacs--rel--22

[gnu-emacs] / src / macgui.h

diff --git a/src/macgui.h b/src/macgui.h
index c549a885f48a1c1bde5850b104ee24109bbcafea..41ac28f49ec87e9ba8d6e369ee1a531e5267e413 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -126,6 +126,10 @@ typedef unsigned long Time;
 #endif
 #endif
 
+#ifndef CGFLOAT_DEFINED
+typedef float CGFloat;
+#endif
+
 typedef WindowRef Window;
 #if TARGET_API_MAC_CARBON
 typedef ScrapRef Selection;
@@ -149,6 +153,7 @@ typedef int Selection;
 #define mac_size_window                SizeWindow
 #define mac_get_global_mouse   GetGlobalMouse
 #define mac_is_window_toolbar_visible  IsWindowToolbarVisible
+#define mac_rect_make(f, x, y, w, h)   CGRectMake (x, y, w, h)
 typedef GWorldPtr Pixmap;
 
 #define Cursor ThemeCursor