diff options
| author | Jan Djärv | 2006-11-17 13:02:53 +0000 |
|---|---|---|
| committer | Jan Djärv | 2006-11-17 13:02:53 +0000 |
| commit | 118ddbddd2afa4079ec6750e608f7d943f42db30 (patch) | |
| tree | d620ef21ffb308fe5bda3d819a5ed39d3c23864f | |
| parent | 347d9bbe01304b571d497eb60b5891044b428798 (diff) | |
| download | emacs-118ddbddd2afa4079ec6750e608f7d943f42db30.tar.gz emacs-118ddbddd2afa4079ec6750e608f7d943f42db30.zip | |
Declare variable before XSETFRAME to avoid gcc 2.96 error.
Tetsurou Okazaki <okazaki@be.to> (tiny change)
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2f7149e6e94..3757d350eb5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-11-17 Tetsurou Okazaki <okazaki@be.to> (tiny change) | ||
| 2 | |||
| 3 | * xterm.c (do_ewmh_fullscreen): Declare variable before XSETFRAME | ||
| 4 | to avoid gcc 2.96 error. | ||
| 5 | |||
| 1 | 2006-11-17 NIIMI Satoshi <sa2c@sa2c.net> (tiny change) | 6 | 2006-11-17 NIIMI Satoshi <sa2c@sa2c.net> (tiny change) |
| 2 | 7 | ||
| 3 | * search.c (simple_search): In the loop of backward searching, | 8 | * search.c (simple_search): In the loop of backward searching, |
diff --git a/src/xterm.c b/src/xterm.c index 7d86168f01f..a266282c6ac 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -8333,13 +8333,14 @@ do_ewmh_fullscreen (f) | |||
| 8333 | if (have_net_atom) | 8333 | if (have_net_atom) |
| 8334 | { | 8334 | { |
| 8335 | Lisp_Object frame; | 8335 | Lisp_Object frame; |
| 8336 | XSETFRAME (frame, f); | ||
| 8337 | const char *atom = "_NET_WM_STATE"; | 8336 | const char *atom = "_NET_WM_STATE"; |
| 8338 | const char *fs = "_NET_WM_STATE_FULLSCREEN"; | 8337 | const char *fs = "_NET_WM_STATE_FULLSCREEN"; |
| 8339 | const char *fw = "_NET_WM_STATE_MAXIMIZED_HORZ"; | 8338 | const char *fw = "_NET_WM_STATE_MAXIMIZED_HORZ"; |
| 8340 | const char *fh = "_NET_WM_STATE_MAXIMIZED_VERT"; | 8339 | const char *fh = "_NET_WM_STATE_MAXIMIZED_VERT"; |
| 8341 | const char *what = NULL; | 8340 | const char *what = NULL; |
| 8342 | 8341 | ||
| 8342 | XSETFRAME (frame, f); | ||
| 8343 | |||
| 8343 | /* If there are _NET_ atoms we assume we have extended window manager | 8344 | /* If there are _NET_ atoms we assume we have extended window manager |
| 8344 | hints. */ | 8345 | hints. */ |
| 8345 | switch (f->want_fullscreen) | 8346 | switch (f->want_fullscreen) |