Link changes for Cygwin unexec() support.

[bpt/emacs.git] / src / image.c

diff --git a/src/image.c b/src/image.c
index 1067227..34db5e5 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -49,8 +49,6 @@ Boston, MA 02111-1307, USA.  */
 #define COLOR_TABLE_SUPPORT 1
 
 typedef struct x_bitmap_record Bitmap_Record;
-typedef XImage * XImagePtr;
-typedef XImagePtr XImagePtr_or_DC;
 #define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
 #define NO_PIXMAP None
 #define PNG_BG_COLOR_SHIFT 0
@@ -69,8 +67,6 @@ typedef XImagePtr XImagePtr_or_DC;
 #undef COLOR_TABLE_SUPPORT
 
 typedef struct w32_bitmap_record Bitmap_Record;
-typedef XImage *XImagePtr;
-typedef HDC XImagePtr_or_DC;
 #define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y)
 #define NO_PIXMAP 0
 #define PNG_BG_COLOR_SHIFT 0
@@ -103,12 +99,9 @@ typedef HDC XImagePtr_or_DC;
 /* MAC_TODO : Color tables on Mac.  */
 #undef COLOR_TABLE_SUPPORT
 
-/* Mac equivalent of XImage.  */
-typedef Pixmap XImagePtr;
 #define ZPixmap 0              /* arbitrary */
 typedef struct mac_bitmap_record Bitmap_Record;
 
-typedef XImagePtr XImagePtr_or_DC;
 #define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
 #define NO_PIXMAP 0
 #define PNG_BG_COLOR_SHIFT 8
@@ -613,6 +606,7 @@ Lisp_Object Qxbm;
 
 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile;
 extern Lisp_Object QCdata, QCtype;
+extern Lisp_Object Qcenter;
 Lisp_Object QCascent, QCmargin, QCrelief;
 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
@@ -620,7 +614,6 @@ Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
 /* Other symbols.  */
 
 Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic;
-Lisp_Object Qcenter;
 
 /* Time in seconds after which images should be removed from the cache
    if not displayed.  */
@@ -2005,7 +1998,6 @@ x_put_x_image (f, ximg, pixmap, width, height)
                              File Handling
  ***********************************************************************/
 
-static Lisp_Object x_find_image_file P_ ((Lisp_Object));
 static unsigned char *slurp_file P_ ((char *, int *));
 
 
@@ -2013,7 +2005,7 @@ static unsigned char *slurp_file P_ ((char *, int *));
    x-bitmap-file-path.  Value is the full name of the file found, or
    nil if not found.  */
 
-static Lisp_Object
+Lisp_Object
 x_find_image_file (file)
      Lisp_Object file;
 {
@@ -7408,8 +7400,6 @@ syms_of_image ()
   staticpro (&Qedge_detection);
   Qheuristic = intern ("heuristic");
   staticpro (&Qheuristic);
-  Qcenter = intern ("center");
-  staticpro (&Qcenter);
 
   Qpostscript = intern ("postscript");
   staticpro (&Qpostscript);