[Emacs-diffs] /srv/bzr/emacs/trunk r112064: Fix return type of image_background (Bug#13981)

[Ken Brown]

------------------------------------------------------------
revno: 112064
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-17 10:34:18 -0400
message:
  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.
modified:
  src/ChangeLog
  src/dispextern.h
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-16 14:22:37 +0000
+++ b/src/ChangeLog     2013-03-17 14:34:18 +0000
@@ -1,3 +1,9 @@
+2013-03-17  Ken Brown  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsterm.m (updateFrameSize:): Change resize increments if needed.

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2013-01-02 16:13:04 +0000
+++ b/src/dispextern.h  2013-03-17 14:34:18 +0000
@@ -3186,7 +3186,15 @@
 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);

=== modified file 'src/image.c'
--- a/src/image.c       2013-03-04 17:35:29 +0000
+++ b/src/image.c       2013-03-17 14:34:18 +0000
@@ -68,8 +68,6 @@
 #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 @@
 #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 @@
 #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