update.

[chise/xemacs-chise.git.1] / src / eldap.c

diff --git a/src/eldap.c b/src/eldap.c
index c26272d..16756e5 100644 (file)
--- a/src/eldap.c
+++ b/src/eldap.c
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "eldap.h"
 
-static int ldap_default_port;
+static Fixnum ldap_default_port;
 static Lisp_Object Vldap_default_base;
 
 /* Needed by the lrecord definition */
@@ -120,7 +120,7 @@ print_ldap (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
   print_internal (ldap->host, printcharfun, 1);
   if (!ldap->ld)
     write_c_string ("(dead) ",printcharfun);
-  sprintf (buf, " 0x%x>", (unsigned int)ldap);
+  sprintf (buf, " 0x%lx>", (long)ldap);
   write_c_string (buf, printcharfun);
 }
 
@@ -701,8 +701,6 @@ or `replace'. ATTR is the LDAP attribute type to modify.
   Lisp_Object values  = Qnil;
   struct gcpro gcpro1, gcpro2;
 
-  GCPRO2 (current, values);
-
   /* Do all the parameter checking  */
   CHECK_LIVE_LDAP (ldap);
   ld = XLDAP (ldap)->ld;
@@ -720,6 +718,8 @@ or `replace'. ATTR is the LDAP attribute type to modify.
   ldap_mods = alloca_array (LDAPMod, len);
   ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len);
   i = 0;
+
+  GCPRO2 (current, values);
   EXTERNAL_LIST_LOOP (mods, mods)
     {
       current = XCAR (mods);