diff src/inline.c @ 3050:67b6f3514ffc

[xemacs-hg @ 2005-11-07 08:49:12 by stephent] Various small patches (also commit configure): Minor improvements to INSTALL <877jbk3nkk.fsf@tleepslib.sk.tsukuba.ac.jp> Add description of changed options to INSTALL <873bm83ncd.fsf@tleepslib.sk.tsukuba.ac.jp> Check for libpq (PostgreSQL) linking against SSL and crypto <87y8402820.fsf@tleepslib.sk.tsukuba.ac.jp> Include module INLINE_HEADERs in inline.c unconditionally <87u0eo27rn.fsf@tleepslib.sk.tsukuba.ac.jp> Fix use of AC_INIT <87pspc27oh.fsf@tleepslib.sk.tsukuba.ac.jp> Minor ChangeLog repairs <87ll0027jq.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Mon, 07 Nov 2005 08:49:25 +0000
parents 01c57eb70ae9
children ad2f4ae9895b
line wrap: on
line diff
--- a/src/inline.c	Sun Nov 06 22:51:25 2005 +0000
+++ b/src/inline.c	Mon Nov 07 08:49:25 2005 +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