From ef141b8d52160d01aff957f4a8109f205ab50eae Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Sat, 10 Jan 2009 08:28:16 -0800
Subject: [PATCH] Synchronize pldhash with recent changes to jsdhash by
 rerunning through plify_jsdhash.sed.

---
 xpcom/glue/pldhash.c |  8 ++++----
 xpcom/glue/pldhash.h | 18 +++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/xpcom/glue/pldhash.c b/xpcom/glue/pldhash.c
index c1a04ae7676..d14b757bc82 100644
--- a/xpcom/glue/pldhash.c
+++ b/xpcom/glue/pldhash.c
@@ -68,7 +68,7 @@
  */
 #ifdef DEBUG
 
-#define JSDHASH_SINGLE_LINE_ASSERTION PR_ASSERT
+#define JSDHASH_ONELINE_ASSERT PR_ASSERT
 #define RECURSION_LEVEL(table_) (*(PRUint32*)(table_->entryStore + \
                                             PL_DHASH_TABLE_SIZE(table_) * \
                                             table_->entrySize))
@@ -78,10 +78,10 @@
     PR_BEGIN_MACRO                          \
       ++RECURSION_LEVEL(table_);            \
     PR_END_MACRO
-#define DECREMENT_RECURSION_LEVEL(table_)                         \
-    PR_BEGIN_MACRO                                                \
+#define DECREMENT_RECURSION_LEVEL(table_)                  \
+    PR_BEGIN_MACRO                                         \
       NS_ASSERTION(RECURSION_LEVEL(table_) > 0, "RECURSION_LEVEL(table_) > 0"); \
-      --RECURSION_LEVEL(table_);                                \
+      --RECURSION_LEVEL(table_);                           \
     PR_END_MACRO
 
 #else
diff --git a/xpcom/glue/pldhash.h b/xpcom/glue/pldhash.h
index f118f83f382..3715f456412 100644
--- a/xpcom/glue/pldhash.h
+++ b/xpcom/glue/pldhash.h
@@ -256,9 +256,8 @@ typedef PLDHashNumber
  * Return PR_TRUE if keys match, PR_FALSE otherwise.
  */
 typedef PRBool
-(* PLDHashMatchEntry)(PLDHashTable *table,
-                                      const PLDHashEntryHdr *entry,
-                                      const void *key);
+(* PLDHashMatchEntry)(PLDHashTable *table, const PLDHashEntryHdr *entry,
+                      const void *key);
 
 /*
  * Copy the data starting at from to the new entry storage at to.  Do not add
@@ -267,8 +266,7 @@ typedef PRBool
  * any reference-decrementing callback shortly.
  */
 typedef void
-(* PLDHashMoveEntry)(PLDHashTable *table,
-                     const PLDHashEntryHdr *from,
+(* PLDHashMoveEntry)(PLDHashTable *table, const PLDHashEntryHdr *from,
                      PLDHashEntryHdr *to);
 
 /*
@@ -277,8 +275,7 @@ typedef void
  * but only if the given key is found in the table.
  */
 typedef void
-(* PLDHashClearEntry)(PLDHashTable *table,
-                      PLDHashEntryHdr *entry);
+(* PLDHashClearEntry)(PLDHashTable *table, PLDHashEntryHdr *entry);
 
 /*
  * Called when a table (whether allocated dynamically by itself, or nested in
@@ -296,8 +293,7 @@ typedef void
  * table.
  */
 typedef PRBool
-(* PLDHashInitEntry)(PLDHashTable *table,
-                     PLDHashEntryHdr *entry,
+(* PLDHashInitEntry)(PLDHashTable *table, PLDHashEntryHdr *entry,
                      const void *key);
 
 /*
@@ -575,8 +571,8 @@ PL_DHashTableRawRemove(PLDHashTable *table, PLDHashEntryHdr *entry);
  * the entry being enumerated, rather than returning PL_DHASH_REMOVE.
  */
 typedef PLDHashOperator
-(* PLDHashEnumerator)(PLDHashTable *table, PLDHashEntryHdr *hdr,
-                                      PRUint32 number, void *arg);
+(* PLDHashEnumerator)(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number,
+                      void *arg);
 
 NS_COM_GLUE PRUint32
 PL_DHashTableEnumerate(PLDHashTable *table, PLDHashEnumerator etor, void *arg);