# HG changeset patch # User james # Date 1042822766 0 # Node ID 848225013a08826c60e062b56d46a7c147879dd2 # Parent 4d3295160d6a480cf8376dd9f4d2340cc6daa8d5 [xemacs-hg @ 2003-01-17 16:59:20 by james] Fix modules building breakage due to Ben's Dec. 16 patch. diff -r 4d3295160d6a -r 848225013a08 modules/ChangeLog --- a/modules/ChangeLog Thu Jan 16 22:52:17 2003 +0000 +++ b/modules/ChangeLog Fri Jan 17 16:59:26 2003 +0000 @@ -1,3 +1,7 @@ +2003-01-15 Jerry James + + * ldap/eldap.c: Apply Ben's postgresql change to LDAP also. + 2002-12-16 Ben Wing * postgresql/postgresql.c: diff -r 4d3295160d6a -r 848225013a08 modules/ldap/eldap.c --- a/modules/ldap/eldap.c Thu Jan 16 22:52:17 2003 +0000 +++ b/modules/ldap/eldap.c Fri Jan 17 16:59:26 2003 +0000 @@ -100,12 +100,10 @@ return wrap_ldap (ldap); } -#ifdef USE_KKCC -static const struct lrecord_description ldap_description [] = { +static const struct memory_description ldap_description [] = { { XD_LISP_OBJECT, offsetof (struct Lisp_LDAP, host) }, { XD_END } }; -#endif /* USE_KKCC */ static Lisp_Object mark_ldap (Lisp_Object obj) @@ -151,17 +149,9 @@ ldap->ld = NULL; } -#ifdef USE_KKCC -DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap, - 0, /*dumpable-flag*/ +DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap, 0, mark_ldap, print_ldap, finalize_ldap, NULL, NULL, ldap_description, Lisp_LDAP); -#else /* not USE_KKCC */ -DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap, - mark_ldap, print_ldap, finalize_ldap, - NULL, NULL, 0, Lisp_LDAP); -#endif /* not USE_KKCC */ - /************************************************************************/ diff -r 4d3295160d6a -r 848225013a08 src/ChangeLog --- a/src/ChangeLog Thu Jan 16 22:52:17 2003 +0000 +++ b/src/ChangeLog Fri Jan 17 16:59:26 2003 +0000 @@ -1,3 +1,7 @@ +2003-01-15 Jerry James + + * emodules.h: #undef everything we redefine for module code. + 2003-01-14 Sergey Okhapkin * Makefile.in.in (ldflags): re-order sections for gcc 3.2. diff -r 4d3295160d6a -r 848225013a08 src/emodules.h --- a/src/emodules.h Thu Jan 16 22:52:17 2003 +0000 +++ b/src/emodules.h Fri Jan 17 16:59:26 2003 +0000 @@ -82,23 +82,29 @@ /* We should not expose module entities to the portable dumper. */ #if defined(PDUMP) && !defined(EMODULES_DO_NOT_REDEFINE) +#undef dump_add_root_struct_ptr #define dump_add_root_struct_ptr(varaddr,descaddr) DO_NOTHING +#undef dump_add_opaque #define dump_add_opaque(varaddr,size) DO_NOTHING +#undef dump_add_root_block #define dump_add_root_block(ptraddress,desc) DO_NOTHING #undef dump_add_opaque_int #define dump_add_opaque_int(int_varaddr) DO_NOTHING #undef dump_add_opaque_fixnum #define dump_add_opaque_fixnum(fixnum_varaddr) DO_NOTHING +#undef dump_add_root_lisp_object #define dump_add_root_lisp_object(varaddr) DO_NOTHING +#undef dump_add_weak_object_chain #define dump_add_weak_object_chain(varaddr) DO_NOTHING #undef staticpro #define staticpro(DSF_location) staticpro_nodump(DSF_location) #undef DEFSYMBOL +#define DEFSYMBOL(name) DEFSYMBOL_NO_DUMP (name) #undef DEFSYMBOL_MULTIWORD_PREDICATE -#define DEFSYMBOL(name) DEFSYMBOL_NO_DUMP (name) #define DEFSYMBOL_MULTIWORD_PREDICATE(name) \ DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP (name) +#undef defsymbol #define defsymbol(location,name) defsymbol_nodump (location, name) #endif