[Emacs-diffs] /srv/bzr/emacs/trunk r105442: Fix minor problems caught by static checking.

[Paul Eggert]

------------------------------------------------------------
revno: 105442 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-08-13 23:08:07 -0700
message:
  Fix minor problems caught by static checking.
modified:
  src/ChangeLog
  src/dispextern.h
  src/process.c
  src/xfaces.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-13 10:48:03 +0000
+++ b/src/ChangeLog     2011-08-14 05:28:42 +0000
@@ -1,3 +1,10 @@
+2011-08-14  Paul Eggert  <address@hidden>
+
+       * xfaces.c (Qframe_set_background_mode): Now static.
+       * dispextern.h (Qframe_set_background_mode): Remove decl.
+
+       * process.c (Fnetwork_interface_info): Declare local only if needed.
+
 2011-08-13  Jan Djärv  <address@hidden>
 
        * process.c: Include ifaddrs.h and net/if_dl.h if available (Bug#8477).

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2011-08-05 11:04:44 +0000
+++ b/src/dispextern.h  2011-08-14 05:28:42 +0000
@@ -3202,7 +3202,6 @@
 int compute_char_face (struct frame *, int, Lisp_Object);
 void free_all_realized_faces (Lisp_Object);
 extern Lisp_Object Qforeground_color, Qbackground_color;
-extern Lisp_Object Qframe_set_background_mode;
 extern char unspecified_fg[], unspecified_bg[];
 
 /* Defined in xfns.c  */

=== modified file 'src/process.c'
--- a/src/process.c     2011-08-13 10:48:03 +0000
+++ b/src/process.c     2011-08-14 05:23:51 +0000
@@ -3726,7 +3726,8 @@
   Lisp_Object elt;
   int s;
   int any = 0;
-#if defined(HAVE_GETIFADDRS)
+#if (! (defined SIOCGIFHWADDR && defined HAVE_STRUCT_IFREQ_IFR_HWADDR) \
+     && defined HAVE_GETIFADDRS && defined LLADDR)
   struct ifaddrs *ifap;
 #endif
 

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2011-08-09 22:13:11 +0000
+++ b/src/xfaces.c      2011-08-14 05:28:42 +0000
@@ -339,7 +339,7 @@
 /* The name of the function to call when the background of the frame
    has changed, frame_set_background_mode.  */
 
-Lisp_Object Qframe_set_background_mode;
+static Lisp_Object Qframe_set_background_mode;
 
 /* Names of basic faces.  */