aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorKen Brown2013-03-17 10:34:18 -0400
committerKen Brown2013-03-17 10:34:18 -0400
commit6db423a92abf874f1780b8ddb2786dff4fc5b942 (patch)
treeab0360968e418a49eaa964381f0ecf57c94979a1 /src/image.c
parent9c44569ea2a18099307e0571d523d8637000a153 (diff)
downloademacs-6db423a92abf874f1780b8ddb2786dff4fc5b942.tar.gz
emacs-6db423a92abf874f1780b8ddb2786dff4fc5b942.zip
Fix return type of image_background (Bug#13981)
* src/dispextern.h (RGB_PIXEL_COLOR): Move here from image.c. Use it as return type of image_background. (Bug#13981) * src/image.c (RGB_PIXEL_COLOR): Move to dispextern.h.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c
index 2d4e7e731ad..0d4bc82f3b4 100644
--- a/src/image.c
+++ b/src/image.c
@@ -68,8 +68,6 @@ typedef struct x_bitmap_record Bitmap_Record;
68#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y) 68#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
69#define NO_PIXMAP None 69#define NO_PIXMAP None
70 70
71#define RGB_PIXEL_COLOR unsigned long
72
73#define PIX_MASK_RETAIN 0 71#define PIX_MASK_RETAIN 0
74#define PIX_MASK_DRAW 1 72#define PIX_MASK_DRAW 1
75#endif /* HAVE_X_WINDOWS */ 73#endif /* HAVE_X_WINDOWS */
@@ -88,8 +86,6 @@ typedef struct w32_bitmap_record Bitmap_Record;
88#define GET_PIXEL(ximg, x, y) GetPixel (ximg, x, y) 86#define GET_PIXEL(ximg, x, y) GetPixel (ximg, x, y)
89#define NO_PIXMAP 0 87#define NO_PIXMAP 0
90 88
91#define RGB_PIXEL_COLOR COLORREF
92
93#define PIX_MASK_RETAIN 0 89#define PIX_MASK_RETAIN 0
94#define PIX_MASK_DRAW 1 90#define PIX_MASK_DRAW 1
95 91
@@ -110,7 +106,6 @@ typedef struct ns_bitmap_record Bitmap_Record;
110#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y) 106#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
111#define NO_PIXMAP 0 107#define NO_PIXMAP 0
112 108
113#define RGB_PIXEL_COLOR unsigned long
114#define ZPixmap 0 109#define ZPixmap 0
115 110
116#define PIX_MASK_RETAIN 0 111#define PIX_MASK_RETAIN 0