diff options
| author | Glenn Morris | 2007-08-15 03:19:47 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-08-15 03:19:47 +0000 |
| commit | 0c9848246b598ebb84af542bbcc3092fcb6ec93b (patch) | |
| tree | ad656c8fe171b030c16d56bf2ec0dec57d4a799a /src | |
| parent | 28c595fb5cf801127625109ecb56a6bffb5fb367 (diff) | |
| download | emacs-0c9848246b598ebb84af542bbcc3092fcb6ec93b.tar.gz emacs-0c9848246b598ebb84af542bbcc3092fcb6ec93b.zip | |
Philippe Waroquiers <philippe.waroquiers at eurocontrol.int>
(tty_default_color_capabilities): Explicitly initialize static
variables in file scope, to avoid HPUX compiler problem.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/term.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3cfec569bdd..099ad8e8557 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-08-15 Philippe Waroquiers <philippe.waroquiers@eurocontrol.int> | ||
| 2 | |||
| 3 | * term.c (tty_default_color_capabilities): Explicitly initialize | ||
| 4 | static variables in file scope, to avoid HPUX compiler problem. | ||
| 5 | |||
| 1 | 2007-08-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 6 | 2007-08-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * gtkutil.c (update_frame_tool_bar): Use -1 as index | 8 | * gtkutil.c (update_frame_tool_bar): Use -1 as index |
diff --git a/src/term.c b/src/term.c index 0648b960a6d..96697610a9b 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -2169,15 +2169,19 @@ DEFUN ("tty-display-color-cells", Ftty_display_color_cells, | |||
| 2169 | 2169 | ||
| 2170 | #ifndef WINDOWSNT | 2170 | #ifndef WINDOWSNT |
| 2171 | 2171 | ||
| 2172 | static int default_max_colors = 0; | ||
| 2173 | static int default_max_pairs = 0; | ||
| 2174 | static int default_no_color_video = 0; | ||
| 2175 | static char *default_orig_pair = NULL; | ||
| 2176 | static char *default_set_foreground = NULL; | ||
| 2177 | static char *default_set_background = NULL; | ||
| 2178 | |||
| 2172 | /* Save or restore the default color-related capabilities of this | 2179 | /* Save or restore the default color-related capabilities of this |
| 2173 | terminal. */ | 2180 | terminal. */ |
| 2174 | static void | 2181 | static void |
| 2175 | tty_default_color_capabilities (save) | 2182 | tty_default_color_capabilities (save) |
| 2176 | int save; | 2183 | int save; |
| 2177 | { | 2184 | { |
| 2178 | static char | ||
| 2179 | *default_orig_pair, *default_set_foreground, *default_set_background; | ||
| 2180 | static int default_max_colors, default_max_pairs, default_no_color_video; | ||
| 2181 | 2185 | ||
| 2182 | if (save) | 2186 | if (save) |
| 2183 | { | 2187 | { |