[AC21.5R21.4] Include module INLINE_HEADERs in inline.c unconditionally

APPROVE COMMIT 21.5 RECOMMEND 21.4 This isn't yet an actual recommendation for 21.4, as I expect most people turn off error-checking for that version. It probably doesn't matter but I thought I'd ask: Do you want me to work up a patch, Vin? See the comment in the patch for background and rationale. It's needed on both Darwin and Linux, so probably it's generally necessary. Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.878 diff -u -U0 -r1.878 ChangeLog --- src/ChangeLog 26 Oct 2005 15:14:53 -0000 1.878 +++ src/ChangeLog 7 Nov 2005 08:14:52 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * inline.c: Include modules headers regardless of HAVE_SHLIB. + Index: src/inline.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/inline.c,v retrieving revision 1.20 diff -u -r1.20 inline.c --- src/inline.c 9 Mar 2003 02:27:44 -0000 1.20 +++ src/inline.c 7 Nov 2005 07:36:44 -0000 ＠＠ -67,11 +67,22 ＠＠ #include "syntax.h" #include "window.h" -#if defined (HAVE_LDAP) && !defined (HAVE_SHLIB) +/* If we demand !defined (HAVE_SHLIB) the INLINE_HEADERS aren't instantiated. + This only shows up in --with-error-checking=types builds AFAIK. + On Mac OS X 10.3.9 with the Apple toolchain (GCC 3.3) gives a buildtime + link error (the lrecord error_check functions are undefined). + Debian GNU/Linux `sid' with GCC 4.0.3 prerelease & binutils 2.16.91 gives + a runtime link error (the lrecord error_check functions are undefined). + It is possible that this can be fixed trickily by appropriately defining + INLINE, or that it should be done in the module itself somehow. If you + can do it better or more elegantly, please feel free to consult me. + --stephen 2005-11-07 */ +#if defined (HAVE_LDAP) #include "../modules/ldap/eldap.h" #endif -#if defined (HAVE_POSTGRESQL) && !defined (HAVE_SHLIB) +/* We can't ask for !defined (HAVE_SHLIB). See HAVE_LDAP, above. */ +#if defined (HAVE_POSTGRESQL) #include "../modules/postgresql/postgresql.h" #endif -- School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.