[Emacs-diffs] /srv/bzr/emacs/trunk r106421: Revert last commit.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106421
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-19 10:39:42 +0200
message:
  Revert last commit.
modified:
  src/ChangeLog
  src/dispextern.h
  src/dispnew.c
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-18 18:29:29 +0000
+++ b/src/ChangeLog     2011-11-19 08:39:42 +0000
@@ -1,9 +1,3 @@
-2011-11-18  Paul Eggert  <address@hidden>
-
-       Fix minor problems found by static checking.
-       * dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS.
-       * dispnew.c (verify_row_hash): Now static.
-
 2011-11-18  Dmitry Antipov  <address@hidden>
 
        * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2011-11-18 18:29:29 +0000
+++ b/src/dispextern.h  2011-11-19 08:39:42 +0000
@@ -3127,9 +3127,7 @@
 void w32_reset_fringes (void);
 #endif
 
-#if XASSERTS
 extern unsigned row_hash (struct glyph_row *);
-#endif
 
 /* Defined in image.c */
 

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2011-11-18 18:29:29 +0000
+++ b/src/dispnew.c     2011-11-19 08:39:42 +0000
@@ -431,7 +431,7 @@
 
 #if XASSERTS
 /* Return non-zero if ROW's hash value is correct, zero if not.  */
-static int
+int
 verify_row_hash (struct glyph_row *row)
 {
   return row->hash == row_hash (row);

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-11-18 18:29:29 +0000
+++ b/src/xdisp.c       2011-11-19 08:39:42 +0000
@@ -17950,9 +17950,6 @@
 }
 
 /* Compute the hash code for ROW.  */
-#if !XASSERTS
-static
-#endif
 unsigned
 row_hash (struct glyph_row *row)
 {