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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a2a36c0cf747b575443cc905fa8a53d98905fbb..4ece74002760f5320f4c69bbfb6cc8ec470d9e18 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-17  Ken Brown  <kbrown@cornell.edu>
+
+       * dispextern.h (RGB_PIXEL_COLOR): Move here from image.c.  Use it
+       as return type of image_background.  (Bug#13981)
+       * image.c (RGB_PIXEL_COLOR): Move to dispextern.h.
+
 2013-03-16  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (updateFrameSize:): Change resize increments if needed.

diff --git a/src/dispextern.h b/src/dispextern.h
index 46878745c079bbd979b8dd54a6114e7cedf4b982..a696abfddbbe2dc533d5a8f9fe9e31674c920b40 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3186,7 +3186,15 @@ bool valid_image_p (Lisp_Object);
 void prepare_image_for_display (struct frame *, struct image *);
 ptrdiff_t lookup_image (struct frame *, Lisp_Object);
 
-unsigned long image_background (struct image *, struct frame *,
+#if defined (HAVE_X_WINDOWS) ||  defined (HAVE_NS)
+#define RGB_PIXEL_COLOR unsigned long
+#endif
+
+#ifdef HAVE_NTGUI
+#define RGB_PIXEL_COLOR COLORREF
+#endif
+
+RGB_PIXEL_COLOR image_background (struct image *, struct frame *,
                                 XImagePtr_or_DC ximg);
 int image_background_transparent (struct image *, struct frame *,
                                   XImagePtr_or_DC mask);

diff --git a/src/image.c b/src/image.c
index 2d4e7e731ad81f0476ea29a1e9b18bbb15419b3a..0d4bc82f3b40dd74bc73d1c69e38852f25b5e4a2 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -68,8 +68,6 @@ typedef struct x_bitmap_record Bitmap_Record;
 #define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
 #define NO_PIXMAP None
 
-#define RGB_PIXEL_COLOR unsigned long
-
 #define PIX_MASK_RETAIN        0
 #define PIX_MASK_DRAW  1
 #endif /* HAVE_X_WINDOWS */
@@ -88,8 +86,6 @@ typedef struct w32_bitmap_record Bitmap_Record;
 #define GET_PIXEL(ximg, x, y) GetPixel (ximg, x, y)
 #define NO_PIXMAP 0
 
-#define RGB_PIXEL_COLOR COLORREF
-
 #define PIX_MASK_RETAIN        0
 #define PIX_MASK_DRAW  1
 
@@ -110,7 +106,6 @@ typedef struct ns_bitmap_record Bitmap_Record;
 #define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
 #define NO_PIXMAP 0
 
-#define RGB_PIXEL_COLOR unsigned long
 #define ZPixmap 0
 
 #define PIX_MASK_RETAIN        0