[PATCH 21.5] Module build problem

Vin Shelton <shelton(a)icd.teradyne.com&gt; wrote: Yes, it looks like this is due to Ben's December 16 patch. My patch is still correct, it just doesn't fix Ben's breakage. :-) We'll accomplish that with this patch. src/ChangeLog addition: 2003-01-15 Jerry James <james(a)eecs.ku.edu&gt; * emodules.h: #undef everything we redefine for module code. modules/ChangeLog addition: 2003-01-15 Jerry James <james(a)eecs.ku.edu&gt; * ldap/eldap.c: Apply Ben's postgresql change to LDAP also. xemacs-21.5 Patch (cvs -q diff -uN): Index: modules/ldap/eldap.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ldap/eldap.c,v retrieving revision 1.3 diff -d -u -r1.3 eldap.c --- modules/ldap/eldap.c 2002/09/10 15:27:14 1.3 +++ modules/ldap/eldap.c 2003/01/15 20:24:26 ＠＠ -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 */ -  /************************************************************************/ Index: src/emodules.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emodules.h,v retrieving revision 1.6 diff -d -u -r1.6 emodules.h --- src/emodules.h 2003/01/12 11:08:12 1.6 +++ src/emodules.h 2003/01/15 20:24:26 ＠＠ -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 -#undef DEFSYMBOL_MULTIWORD_PREDICATE #define DEFSYMBOL(name) DEFSYMBOL_NO_DUMP (name) +#undef DEFSYMBOL_MULTIWORD_PREDICATE #define DEFSYMBOL_MULTIWORD_PREDICATE(name) \ DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP (name) +#undef defsymbol #define defsymbol(location,name) defsymbol_nodump (location, name) #endif -- Jerry James http://www.ittc.ku.edu/~james/