From: Glenn Morris <rgm@gnu.org>
Date: Wed, 15 Aug 2007 03:19:47 +0000 (+0000)
Subject: Philippe Waroquiers  <philippe.waroquiers at eurocontrol.int>
X-Git-Tag: emacs-pretest-22.1.90~993
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c9848246b598ebb84af542bbcc3092fcb6ec93b;p=emacs.git

Philippe Waroquiers  <philippe.waroquiers at eurocontrol.int>

(tty_default_color_capabilities): Explicitly initialize static
variables in file scope, to avoid HPUX compiler problem.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3cfec569bdd..099ad8e8557 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-15  Philippe Waroquiers  <philippe.waroquiers@eurocontrol.int>
+
+	* term.c (tty_default_color_capabilities): Explicitly initialize
+	static variables in file scope, to avoid HPUX compiler problem.
+
 2007-08-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* 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,
 
 #ifndef WINDOWSNT
 
+static int default_max_colors = 0;
+static int default_max_pairs = 0;
+static int default_no_color_video = 0;
+static char *default_orig_pair = NULL;
+static char *default_set_foreground = NULL;
+static char *default_set_background = NULL;
+
 /* Save or restore the default color-related capabilities of this
    terminal.  */
 static void
 tty_default_color_capabilities (save)
      int save;
 {
-  static char
-    *default_orig_pair, *default_set_foreground, *default_set_background;
-  static int default_max_colors, default_max_pairs, default_no_color_video;
 
   if (save)
     {