Mercurial > hg > xemacs-beta

changeset 5193:41ac827cb71b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix cygwin compile, fix warning and style in elhash.c -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-04-06 Ben Wing <ben@xemacs.org> * elhash.c (Feq_hash): Cast to EMACS_INT to fix warning. * elhash.c (internal_hash): * elhash.c (Feql_hash): Fix spacing before parens. * general-slots.h: * xemacs.def.in.in: Export Qfixnump to fix eldap.c link error.
author Ben Wing <ben@xemacs.org>
date Tue, 06 Apr 2010 23:29:35 -0500
parents 635f4b506855
children 77907bd57d25 ce8ffb95bbe3
files src/ChangeLog src/elhash.c src/general-slots.h src/xemacs.def.in.in
diffstat 4 files changed, 25 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Apr 06 15:08:22 2010 +0100
+++ b/src/ChangeLog	Tue Apr 06 23:29:35 2010 -0500
@@ -1,3 +1,16 @@
+2010-04-06  Ben Wing  <ben@xemacs.org>
+
+	* elhash.c (Feq_hash):
+	Cast to EMACS_INT to fix warning.
+
+	* elhash.c (internal_hash):
+	* elhash.c (Feql_hash):
+	Fix spacing before parens.
+	
+	* general-slots.h:
+	* xemacs.def.in.in:
+	Export Qfixnump to fix eldap.c link error.
+
 2010-04-06  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* toolbar-msw.c (allocate_toolbar_item_id)
--- a/src/elhash.c	Tue Apr 06 15:08:22 2010 +0100
+++ b/src/elhash.c	Tue Apr 06 23:29:35 2010 -0500
@@ -1927,29 +1927,29 @@
   if (depth > 5)
     return 0;
 
-  if (CONSP(obj)) 
+  if (CONSP (obj)) 
     {
       Hashcode hash, h;
       int s;
 
       depth += 1;
 
-      if (!CONSP(XCDR(obj)))
+      if (!CONSP (XCDR (obj)))
 	{
 	  /* special case for '(a . b) conses */
-	  return HASH2(internal_hash(XCAR(obj), depth, equalp),
-		       internal_hash(XCDR(obj), depth, equalp));
+	  return HASH2 (internal_hash (XCAR(obj), depth, equalp),
+			internal_hash (XCDR (obj), depth, equalp));
 	}
 
       /* Don't simply tail recurse; we want to hash lists with the
 	 same contents in distinct orders differently. */
-      hash = internal_hash(XCAR(obj), depth, equalp);
+      hash = internal_hash (XCAR (obj), depth, equalp);
 
-      obj = XCDR(obj);
-      for (s = 1; s < 6 && CONSP(obj); obj = XCDR(obj), s++)
+      obj = XCDR (obj);
+      for (s = 1; s < 6 && CONSP (obj); obj = XCDR (obj), s++)
 	{
-	  h = internal_hash(XCAR(obj), depth, equalp);
-	  hash = HASH3(hash, h, s);
+	  h = internal_hash (XCAR (obj), depth, equalp);
+	  hash = HASH3 (hash, h, s);
 	}
 
       return hash;
@@ -1994,7 +1994,7 @@
 */
        (object))
 {
-  return make_integer (XPNTRVAL (object));
+  return make_integer ((EMACS_INT) XPNTRVAL (object));
 }
 
 DEFUN ("eql-hash", Feql_hash, 1, 1, 0, /*
--- a/src/general-slots.h	Tue Apr 06 15:08:22 2010 +0100
+++ b/src/general-slots.h	Tue Apr 06 23:29:35 2010 -0500
@@ -131,7 +131,7 @@
 SYMBOL_KEYWORD (Q_filter);
 SYMBOL (Qfinal);
 SYMBOL (Qfixnum);
-SYMBOL (Qfixnump);
+SYMBOL_MODULE_API (Qfixnump);
 SYMBOL (Qfloat);
 SYMBOL (Qfont);
 SYMBOL (Qframe);
--- a/src/xemacs.def.in.in	Tue Apr 06 15:08:22 2010 +0100
+++ b/src/xemacs.def.in.in	Tue Apr 06 23:29:35 2010 -0500
@@ -314,6 +314,7 @@
 Qconsp				/* CHECK_CONS */
 Qcritical			/* QUIT, QUITP */
 Qdelete
+Qfixnump			/* CHECK_INT */
 Qfile_name			/* Qdll_filename_encoding */
 Qintegerp			/* CHECK_INT, CONCHECK_INT */
 Qinvalid_argument