# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1268011564 21600
# Node ID 0dcd22290039a4f05b5e08673311892aade6ac05
# Parent  59bac09f31d290b1c269a7fb044877d885d5ff5d
fix issues with finalizers in number.c, postgresql, ldap

-------------------- ChangeLog entries follow: --------------------

modules/ChangeLog addition:

2010-03-07  Ben Wing  <ben@xemacs.org>

	* postgresql/postgresql.c (finalize_pgconn):
	* postgresql/postgresql.c (finalize_pgresult):
	* ldap/eldap.c (finalize_ldap):
	Fix the finalizers to go with the new calling sequence.  Done
	previously but somehow got lost.

src/ChangeLog addition:

2010-03-07  Ben Wing  <ben@xemacs.org>

	* number.c (bignum_finalize):
	* number.c (ratio_finalize):
	* number.c (bigfloat_finalize):
	Fix the finalizers to go with the new calling sequence.  Done
	previously but somehow got lost.

diff -r 59bac09f31d2 -r 0dcd22290039 modules/ChangeLog
--- a/modules/ChangeLog	Sun Mar 07 06:52:32 2010 -0600
+++ b/modules/ChangeLog	Sun Mar 07 19:26:04 2010 -0600
@@ -1,3 +1,11 @@
+2010-03-07  Ben Wing  <ben@xemacs.org>
+
+	* postgresql/postgresql.c (finalize_pgconn):
+	* postgresql/postgresql.c (finalize_pgresult):
+	* ldap/eldap.c (finalize_ldap):
+	Fix the finalizers to go with the new calling sequence.  Done
+	previously but somehow got lost.
+
 2010-03-05  Ben Wing  <ben@xemacs.org>
 
 	* postgresql/postgresql.c (allocate_pgconn):
diff -r 59bac09f31d2 -r 0dcd22290039 modules/ldap/eldap.c
--- a/modules/ldap/eldap.c	Sun Mar 07 06:52:32 2010 -0600
+++ b/modules/ldap/eldap.c	Sun Mar 07 19:26:04 2010 -0600
@@ -149,9 +149,9 @@
 }
 
 static void
-finalize_ldap (void *header)
+finalize_ldap (Lisp_Object obj)
 {
-  Lisp_LDAP *ldap = (Lisp_LDAP *) header;
+  Lisp_LDAP *ldap = XLDAP (obj);
 
   if (ldap->ld)
     ldap_unbind (ldap->ld);
diff -r 59bac09f31d2 -r 0dcd22290039 modules/postgresql/postgresql.c
--- a/modules/postgresql/postgresql.c	Sun Mar 07 06:52:32 2010 -0600
+++ b/modules/postgresql/postgresql.c	Sun Mar 07 19:26:04 2010 -0600
@@ -295,9 +295,9 @@
 #else /* not RUNNING_XEMACS_21_4 */
 
 static void
-finalize_pgconn (void *header)
+finalize_pgconn (Lisp_Object obj)
 {
-  Lisp_PGconn *pgconn = (Lisp_PGconn *)header;
+  Lisp_PGconn *pgconn = XPGCONN (obj);
 
   if (pgconn->pgconn)
     {
@@ -447,9 +447,9 @@
 #else /* not RUNNING_XEMACS_21_4 */
 
 static void
-finalize_pgresult (void *header)
+finalize_pgresult (Lisp_Object obj)
 {
-  Lisp_PGresult *pgresult = (Lisp_PGresult *)header;
+  Lisp_PGresult *pgresult = XPGRESULT (obj);
 
   if (pgresult->pgresult)
     {
diff -r 59bac09f31d2 -r 0dcd22290039 src/ChangeLog
--- a/src/ChangeLog	Sun Mar 07 06:52:32 2010 -0600
+++ b/src/ChangeLog	Sun Mar 07 19:26:04 2010 -0600
@@ -1,3 +1,11 @@
+2010-03-07  Ben Wing  <ben@xemacs.org>
+
+	* number.c (bignum_finalize):
+	* number.c (ratio_finalize):
+	* number.c (bigfloat_finalize):
+	Fix the finalizers to go with the new calling sequence.  Done
+	previously but somehow got lost.
+
 2010-03-06  Ben Wing  <ben@xemacs.org>
 
 	* frame.c (change_frame_size_1):
diff -r 59bac09f31d2 -r 0dcd22290039 src/number.c
--- a/src/number.c	Sun Mar 07 06:52:32 2010 -0600
+++ b/src/number.c	Sun Mar 07 19:26:04 2010 -0600
@@ -61,9 +61,9 @@
 
 #ifdef NEW_GC
 static void
-bignum_finalize (void *header)
+bignum_finalize (Lisp_Object obj)
 {
-  struct Lisp_Bignum *num = (struct Lisp_Bignum *) header;
+  struct Lisp_Bignum *num = XBIGNUM (obj);
   /* #### WARNING: It would be better to put some sort of check to make
      sure this doesn't happen more than once, just in case ---
      e.g. checking if it's zero before finalizing and then setting it to
@@ -155,9 +155,9 @@
 
 #ifdef NEW_GC
 static void
-ratio_finalize (void *header)
+ratio_finalize (Lisp_Object obj)
 {
-  struct Lisp_Ratio *num = (struct Lisp_Ratio *) header;
+  struct Lisp_Ratio *num = XRATIO (obj);
   /* #### WARNING: It would be better to put some sort of check to make
      sure this doesn't happen more than once, just in case ---
      e.g. checking if it's zero before finalizing and then setting it to
@@ -261,9 +261,9 @@
 
 #ifdef NEW_GC
 static void
-bigfloat_finalize (void *header)
+bigfloat_finalize (Lisp_Object obj)
 {
-  struct Lisp_Bigfloat *num = (struct Lisp_Bigfloat *) header;
+  struct Lisp_Bigfloat *num = XBIGFLOAT (obj);
   /* #### WARNING: It would be better to put some sort of check to make
      sure this doesn't happen more than once, just in case ---
      e.g. checking if it's zero before finalizing and then setting it to