diff src/elhash.c @ 14:9ee227acff29 r19-15b90

Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents ac2d302a0011
children 859a2309aef8
line wrap: on
line diff
--- a/src/elhash.c	Mon Aug 13 08:48:18 2007 +0200
+++ b/src/elhash.c	Mon Aug 13 08:48:42 2007 +0200
@@ -198,8 +198,7 @@
   Lisp_Object str1, str2;
   CVOID_TO_LISP (str1, x1);
   CVOID_TO_LISP (str2, x2);
-  return !strcmp ((char *) string_data (XSTRING (str1)),
-		  (char *) string_data (XSTRING (str2))); 
+  return !strcmp ((char *) XSTRING_DATA (str1), (char *) XSTRING_DATA (str2));
 }
 
 unsigned long
@@ -207,8 +206,7 @@
 {
   Lisp_Object str;
   CVOID_TO_LISP (str, x);
-  return hash_string (string_data (XSTRING (str)),
-		      string_length (XSTRING (str)));
+  return hash_string (XSTRING_DATA (str), XSTRING_LENGTH (str));
 }
 
 #endif /* 0 */
@@ -861,8 +859,7 @@
 		    internal_hash (XCDR (obj), depth + 1));
     }
   else if (STRINGP (obj))
-    return hash_string (string_data (XSTRING (obj)),
-			string_length (XSTRING (obj)));
+    return hash_string (XSTRING_DATA (obj), XSTRING_LENGTH (obj));
 #ifndef LRECORD_VECTOR
   else if (VECTORP (obj))
     {