aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-03-11 22:42:47 +0000
committerKim F. Storm2004-03-11 22:42:47 +0000
commit0ccb519d36f8c9e566c49074f5b272a0239bc417 (patch)
tree7589eeb61f27acc3e73c4748e81546afecc38619 /src
parent7837c24765dd3eeac645aac81aa0c6c631e9c2ac (diff)
downloademacs-0ccb519d36f8c9e566c49074f5b272a0239bc417.tar.gz
emacs-0ccb519d36f8c9e566c49074f5b272a0239bc417.zip
* dispextern.h (XImagePtr, XImagePtr_or_DC): Add typedefs.
(image_background, image_background_transparent): Fix prototypes.
Diffstat (limited to 'src')
-rw-r--r--src/dispextern.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 0fb58d4a1d1..4fae030415a 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -50,17 +50,24 @@ typedef struct {
50 50
51#ifdef HAVE_X_WINDOWS 51#ifdef HAVE_X_WINDOWS
52typedef struct x_display_info Display_Info; 52typedef struct x_display_info Display_Info;
53typedef XImage * XImagePtr;
54typedef XImagePtr XImagePtr_or_DC;
53#define NativeRectangle XRectangle 55#define NativeRectangle XRectangle
54#endif 56#endif
55 57
56#ifdef HAVE_NTGUI 58#ifdef HAVE_NTGUI
57#include "w32gui.h" 59#include "w32gui.h"
58typedef struct w32_display_info Display_Info; 60typedef struct w32_display_info Display_Info;
61typedef XImage *XImagePtr;
62typedef HDC XImagePtr_or_DC;
59#endif 63#endif
60 64
61#ifdef HAVE_CARBON 65#ifdef HAVE_CARBON
62#include "macgui.h" 66#include "macgui.h"
63typedef struct mac_display_info Display_Info; 67typedef struct mac_display_info Display_Info;
68/* Mac equivalent of XImage. */
69typedef Pixmap XImagePtr;
70typedef XImagePtr XImagePtr_or_DC;
64#endif 71#endif
65 72
66#ifndef NativeRectangle 73#ifndef NativeRectangle
@@ -2623,9 +2630,9 @@ void prepare_image_for_display P_ ((struct frame *, struct image *));
2623int lookup_image P_ ((struct frame *, Lisp_Object)); 2630int lookup_image P_ ((struct frame *, Lisp_Object));
2624 2631
2625unsigned long image_background P_ ((struct image *, struct frame *, 2632unsigned long image_background P_ ((struct image *, struct frame *,
2626 XImage *ximg)); 2633 XImagePtr_or_DC ximg));
2627int image_background_transparent P_ ((struct image *, struct frame *, 2634int image_background_transparent P_ ((struct image *, struct frame *,
2628 XImage *mask)); 2635 XImagePtr_or_DC mask));
2629 2636
2630#endif 2637#endif
2631 2638