diff options
| author | Paul Eggert | 2011-01-22 18:56:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-22 18:56:06 -0800 |
| commit | 51b59d794fe1d4a82fcd842b478657cc93f91595 (patch) | |
| tree | 25e57573403a13f3fe70934b40bf38c0190fd5ed /src/image.c | |
| parent | 9e928ac989c824c376b1ab576a6da69cd86b12c6 (diff) | |
| download | emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.gz emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.zip | |
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/image.c b/src/image.c index 8f438e26015..542968d2a76 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -350,7 +350,7 @@ x_create_bitmap_from_file (struct frame *f, Lisp_Object file) | |||
| 350 | { | 350 | { |
| 351 | if (dpyinfo->bitmaps[id].refcount | 351 | if (dpyinfo->bitmaps[id].refcount |
| 352 | && dpyinfo->bitmaps[id].file | 352 | && dpyinfo->bitmaps[id].file |
| 353 | && !strcmp (dpyinfo->bitmaps[id].file, (char *) SDATA (file))) | 353 | && !strcmp (dpyinfo->bitmaps[id].file, SSDATA (file))) |
| 354 | { | 354 | { |
| 355 | ++dpyinfo->bitmaps[id].refcount; | 355 | ++dpyinfo->bitmaps[id].refcount; |
| 356 | return id + 1; | 356 | return id + 1; |
| @@ -363,7 +363,7 @@ x_create_bitmap_from_file (struct frame *f, Lisp_Object file) | |||
| 363 | return -1; | 363 | return -1; |
| 364 | emacs_close (fd); | 364 | emacs_close (fd); |
| 365 | 365 | ||
| 366 | filename = (char *) SDATA (found); | 366 | filename = SSDATA (found); |
| 367 | 367 | ||
| 368 | result = XReadBitmapFile (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | 368 | result = XReadBitmapFile (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
| 369 | filename, &width, &height, &bitmap, &xhot, &yhot); | 369 | filename, &width, &height, &bitmap, &xhot, &yhot); |
| @@ -8883,4 +8883,3 @@ void | |||
| 8883 | init_image (void) | 8883 | init_image (void) |
| 8884 | { | 8884 | { |
| 8885 | } | 8885 | } |
| 8886 | |||