summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-03-09 16:58:10 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-03-09 16:58:10 -0800
commitf78faa98a289e2acfa6b448b5faf66331c346224 (patch)
treedfe00efe4a1b0dd90c228f51082b0370ae1c1d88 /src
parent2a8fade06259290024cd7fe98fdeb8fd9709c90f (diff)
downloademacs-f78faa98a289e2acfa6b448b5faf66331c346224.tar.gz
* xfns.c (x_decode_color, x_set_name, x_window): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 13f1715d3ae..b88e07e8356 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-10 Paul Eggert <eggert@cs.ucla.edu>
+
+ * xfns.c (x_decode_color, x_set_name, x_window): Now static.
+
2011-03-09 Paul Eggert <eggert@cs.ucla.edu>
* xterm.h (x_mouse_leave): New decl.
diff --git a/src/xfns.c b/src/xfns.c
index deb0e192a54..d1907567737 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -648,7 +648,7 @@ x_defined_color (struct frame *f, const char *color_name,
is a monochrome frame, return MONO_COLOR regardless of what ARG says.
Signal an error if color can't be allocated. */
-int
+static int
x_decode_color (FRAME_PTR f, Lisp_Object color_name, int mono_color)
{
XColor cdef;
@@ -1635,7 +1635,7 @@ x_set_name_internal (FRAME_PTR f, Lisp_Object name)
suggesting a new name, which lisp code should override; if
F->explicit_name is set, ignore the new name; otherwise, set it. */
-void
+static void
x_set_name (struct frame *f, Lisp_Object name, int explicit)
{
/* Make sure that requests from lisp code override requests from
@@ -2620,7 +2620,7 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
#else /* not USE_X_TOOLKIT */
#ifdef USE_GTK
-void
+static void
x_window (FRAME_PTR f)
{
if (! xg_create_frame_widgets (f))
@@ -2660,7 +2660,7 @@ x_window (FRAME_PTR f)
#else /*! USE_GTK */
/* Create and set up the X window for frame F. */
-void
+static void
x_window (struct frame *f)
{
XClassHint class_hints;