aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-03-11 22:43:06 +0000
committerKim F. Storm2004-03-11 22:43:06 +0000
commit75fd7da16a0782c716d8ed34dd680055e026026d (patch)
tree2a719ae19e89991967de0147a93c4d8363900e37 /src
parent0ccb519d36f8c9e566c49074f5b272a0239bc417 (diff)
downloademacs-75fd7da16a0782c716d8ed34dd680055e026026d.tar.gz
emacs-75fd7da16a0782c716d8ed34dd680055e026026d.zip
(XImagePtr, XImagePtr_or_DC): Move typedefs to dispextern.h.
Diffstat (limited to 'src')
-rw-r--r--src/image.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/image.c b/src/image.c
index 1067227859c..28c5e5c96b1 100644
--- a/src/image.c
+++ b/src/image.c
@@ -49,8 +49,6 @@ Boston, MA 02111-1307, USA. */
49#define COLOR_TABLE_SUPPORT 1 49#define COLOR_TABLE_SUPPORT 1
50 50
51typedef struct x_bitmap_record Bitmap_Record; 51typedef struct x_bitmap_record Bitmap_Record;
52typedef XImage * XImagePtr;
53typedef XImagePtr XImagePtr_or_DC;
54#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y) 52#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
55#define NO_PIXMAP None 53#define NO_PIXMAP None
56#define PNG_BG_COLOR_SHIFT 0 54#define PNG_BG_COLOR_SHIFT 0
@@ -69,8 +67,6 @@ typedef XImagePtr XImagePtr_or_DC;
69#undef COLOR_TABLE_SUPPORT 67#undef COLOR_TABLE_SUPPORT
70 68
71typedef struct w32_bitmap_record Bitmap_Record; 69typedef struct w32_bitmap_record Bitmap_Record;
72typedef XImage *XImagePtr;
73typedef HDC XImagePtr_or_DC;
74#define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y) 70#define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y)
75#define NO_PIXMAP 0 71#define NO_PIXMAP 0
76#define PNG_BG_COLOR_SHIFT 0 72#define PNG_BG_COLOR_SHIFT 0
@@ -103,12 +99,9 @@ typedef HDC XImagePtr_or_DC;
103/* MAC_TODO : Color tables on Mac. */ 99/* MAC_TODO : Color tables on Mac. */
104#undef COLOR_TABLE_SUPPORT 100#undef COLOR_TABLE_SUPPORT
105 101
106/* Mac equivalent of XImage. */
107typedef Pixmap XImagePtr;
108#define ZPixmap 0 /* arbitrary */ 102#define ZPixmap 0 /* arbitrary */
109typedef struct mac_bitmap_record Bitmap_Record; 103typedef struct mac_bitmap_record Bitmap_Record;
110 104
111typedef XImagePtr XImagePtr_or_DC;
112#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y) 105#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
113#define NO_PIXMAP 0 106#define NO_PIXMAP 0
114#define PNG_BG_COLOR_SHIFT 8 107#define PNG_BG_COLOR_SHIFT 8