From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 19 Nov 2011 08:39:42 +0000 (+0200)
Subject: Revert last commit.
X-Git-Tag: emacs-pretest-24.0.92~140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7430c2a1791cc9fdd51b588998d26315489ac0d8;p=emacs.git

Revert last commit.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 76986f60c16..1bb4a6a5993 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,3 @@
-2011-11-18  Paul Eggert  <eggert@cs.ucla.edu>
-
-	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  <dmantipov@yandex.ru>
 
 	* keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.
diff --git a/src/dispextern.h b/src/dispextern.h
index 48dd374f3c5..486aa4f7a40 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3127,9 +3127,7 @@ void w32_init_fringe (struct redisplay_interface *);
 void w32_reset_fringes (void);
 #endif
 
-#if XASSERTS
 extern unsigned row_hash (struct glyph_row *);
-#endif
 
 /* Defined in image.c */
 
diff --git a/src/dispnew.c b/src/dispnew.c
index e4868a237d2..d6bf6666ee2 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -431,7 +431,7 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin
 
 #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);
diff --git a/src/xdisp.c b/src/xdisp.c
index 65e2c1e4f00..ae19e11565b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17950,9 +17950,6 @@ insert_left_trunc_glyphs (struct it *it)
 }
 
 /* Compute the hash code for ROW.  */
-#if !XASSERTS
-static
-#endif
 unsigned
 row_hash (struct glyph_row *row)
 {