aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-26 11:21:55 +0100
committerJuanma Barranquero2014-03-26 11:21:55 +0100
commit5af73b0fe8975eeb47fb270819b4143c18d71caa (patch)
tree94bd8d6b4a3737b0994bd3b9bfd41796af7247a0 /src/image.c
parentc1e6bc0a37980cdedb8bc0454f2b21008fbee0f7 (diff)
downloademacs-5af73b0fe8975eeb47fb270819b4143c18d71caa.tar.gz
emacs-5af73b0fe8975eeb47fb270819b4143c18d71caa.zip
src/*.c: Silence a few warnings about unused vars and functions.
* src/image.c (x_bitmap_height, x_bitmap_width) [HAVE_X_WINDOWS]: * src/sysdep.c (reset_sigio) [!DOS_NT]: Declare conditionally. * src/keyboard.c (read_decoded_event_from_main_queue): #ifdef out variables on Windows. * src/w32.c (unsetenv): Remove unused var `retval'. (emacs_gnutls_pull): Remove unused vars `fdset' and `timeout'. * src/w32fns.c (Ffile_system_info): Use parenthesis in and/or expression. * src/w32notify.c (watch_worker): Remove unnecesary var sleep_result. (start_watching): Remove unused var `thr'. * src/w32proc.c (sys_spawnve): Comment out unused vars `first', `last'. (find_child_console): Remove unnecesary var `thread_id'. * src/w32term.c (w32_read_socket): Comment out unused vars `row', `columns'. (x_focus_frame): #ifdef 0 unused variable `dpyinfo'.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/image.c b/src/image.c
index d6d5ace509d..6b33e1de8a1 100644
--- a/src/image.c
+++ b/src/image.c
@@ -160,6 +160,7 @@ XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel)
160 160
161/* Functions to access the contents of a bitmap, given an id. */ 161/* Functions to access the contents of a bitmap, given an id. */
162 162
163#ifdef HAVE_X_WINDOWS
163static int 164static int
164x_bitmap_height (struct frame *f, ptrdiff_t id) 165x_bitmap_height (struct frame *f, ptrdiff_t id)
165{ 166{
@@ -171,6 +172,7 @@ x_bitmap_width (struct frame *f, ptrdiff_t id)
171{ 172{
172 return FRAME_DISPLAY_INFO (f)->bitmaps[id - 1].width; 173 return FRAME_DISPLAY_INFO (f)->bitmaps[id - 1].width;
173} 174}
175#endif
174 176
175#if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI) 177#if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI)
176ptrdiff_t 178ptrdiff_t