4:13 a.m.
--- "Stephen J. Turnbull" <stephen(a)xemacs.org> wrote:
APPROVE COMMIT 21.5
Per recommendation of Ben. This is not meant to block Marcus's
"xemacs.def.in in modules" patch, but it does work for Mac OS X.
This seems to have snuck in with the Xft merge commit. Sorry!
2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org>
* inline.c: Include modules headers regardless of HAVE_SHLIB.
Reproducing the patch (which was originally sent to xemacs-beta for
discussion).
In the lrecord code, if error checking is turned on, each Lisp object
type automatically gets a error_check_TYPE_name function defined using
DECLARE_INLINE_HEADER. For reasons I don't understand well at all, at
least on Mac OS X 10.3.9 with GCC 3.3 these functions don't get
instantiated for the PostgreSQL and LDAP modules.
The patch below wins for me, but it's not very pleasant as it seems to
imply it's not possible to get an error-checking build outside of the
XEmacs tree.
Comments appreciated.
diff -rN -u old-xft-integration-new/src/inline.c
new-xft-integration-new/src/inline.c
--- old-xft-integration-new/src/inline.c 2005-11-05
00:45:16.000000000 +0900
+++ new-xft-integration-new/src/inline.c 2005-11-05 00:45:24.000000000 +0900
＠＠ -67,11 +67,13 ＠＠
#include "syntax.h"
#include "window.h"
-#if defined (HAVE_LDAP) && !defined (HAVE_SHLIB)
+/* if we demand !define (HAVE_SHLIB) the inlines don't get instantiated */
+#if defined (HAVE_LDAP)
#include "../modules/ldap/eldap.h"
#endif
-#if defined (HAVE_POSTGRESQL) && !defined (HAVE_SHLIB)
+/* if we demand !define (HAVE_SHLIB) the inlines don't get instantiated */
+#if defined (HAVE_POSTGRESQL)
#include "../modules/postgresql/postgresql.h"
#endif
When I turn on error checking and build on Cygwin with this patch applied, I
(still) get lots of unresolved externals in the modules, mostly functions named
error_check_*. I've added those symbols xemacs.def.in.in and generated a new
patch. With the modified xemacs.def.in.in, I'm able to build on Cygwin with
both error checking enabled and disabled.
I have no idea whether or not this is the right thing to do, but it works for
Cygwin.
--Rick
Index: src/xemacs.def.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xemacs.def.in.in,v
retrieving revision 1.11
diff -u -r1.11 xemacs.def.in.in
--- src/xemacs.def.in.in 2005/11/28 16:39:54 1.11
+++ src/xemacs.def.in.in 2005/11/29 04:06:01
＠＠ -82,6 +82,12 ＠＠
eputenv
#ifdef DEBUG_XEMACS
eq_with_ebola_notice /* EQ_WITH_EBOLA_NOTICE */
+error_check_cons
+error_check_ldap
+error_check_opaque_ptr
+error_check_pgconn
+error_check_pgresult
+error_check_string
#endif
free_opaque_ptr
get_coding_system_for_text_file
＠＠ -144,6 +150,9 ＠＠
vector2
vector3
warn_when_safe
+#ifdef DEBUG_XEMACS
+wrap_record_1
+#endif
write_c_string
write_fmt_string
write_fmt_string_lisp
＠＠ -187,6 +196,9 ＠＠
Fsignal
Fthrow
Fvector
+#ifdef DEBUG_XEMACS
+XINT_1
+#endif
/* Exported variables */
__temp_alloca_size__ /* ALLOCA */
8:36 a.m.
New subject: [AC21.5] commit followon patch from Rick Rankin
APPROVE COMMIT 21.5
Per Ben's request.
>>>> "Rick" == Rick Rankin
<rrankin1424-xemacs(a)yahoo.com> writes:
When I turn on error checking and build on Cygwin with this patch applied, I
(still) get lots of unresolved externals in the modules, mostly functions named
error_check_*. I've added those symbols xemacs.def.in.in and generated a new
patch. With the modified xemacs.def.in.in, I'm able to build on Cygwin with
both error checking enabled and disabled.
--
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.
1:32 p.m.
New subject: [PATCH] repair xemacs.def.in.in (was: Implicit INLINE_HEADERS in modules don't get instantiated)
>>>>"RR" == Rick Rankin
<rrankin1424-xemacs(a)yahoo.com> writes:
RR> I have no idea whether or not
this is the right thing to do, but
RR> it works for Cygwin.
I see some problems with Rick's patch:
RR> #ifdef DEBUG_XEMACS
RR> eq_with_ebola_notice /* EQ_WITH_EBOLA_NOTICE */
RR> +error_check_cons
The error_check_* symbols have to be conditioned on ERROR_CHECK_TYPES,
not on DEBUG_XEMACS.
RR> +error_check_ldap
This has to be conditioned on HAVE_LDAP. Only with HAVE_LDAP the
lrecord type `ldap' gets instantiated in inline.c.
RR> +error_check_pgconn
RR> +error_check_pgresult
This has to be conditioned on HAVA_POSTGRESQL, for the same reason as
above.
RR> +error_check_string
The new GC string implementation requires that two more symbols are
added: error_check_direct_string_data and
error_check_indirect_string_data.
RR> +#ifdef DEBUG_XEMACS
RR> +wrap_record_1
RR> +#endif
[...]
RR> +#ifdef DEBUG_XEMACS
RR> +XINT_1
RR> +#endif
Both symbols have to be conditioned on ERROR_CHECK_TYPES.
The patch below repairs it, my other patch
<87zmnpwst0.fsf(a)informatik.uni-tuebingen.de> is no longer needed.
>>>>"SJT" == Stephen J Turnbull
<stephen(a)xemacs.org> writes:
SJT> Aaaaaarrgh!!!! I was ready to release
21.5.24 (tarballs are
SJT> already built)
Stephen, it seems that not many people are using Cygwin anyway, so I
think this patch can wait until the release is out. No need to redo
the whole work for the third time!
src/ChangeLog addition:
2005-11-29 Marcus Crestani <crestani(a)xemacs.org>
* xemacs.def.in.in: Condition error_check_* symbols on
ERROR_CHECK_TYPES.
Index: src/xemacs.def.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xemacs.def.in.in,v
retrieving revision 1.12
diff -u -r1.12 xemacs.def.in.in
--- src/xemacs.def.in.in 29 Nov 2005 08:38:32 -0000 1.12
+++ src/xemacs.def.in.in 29 Nov 2005 13:09:52 -0000
＠＠ -82,12 +82,22 ＠＠
eputenv
#ifdef DEBUG_XEMACS
eq_with_ebola_notice /* EQ_WITH_EBOLA_NOTICE */
+#endif
+#ifdef ERROR_CHECK_TYPES
error_check_cons
+#ifdef HAVA_LDAP
error_check_ldap
+#endif
error_check_opaque_ptr
+#ifdef HAVE_POSTGRESQL
error_check_pgconn
error_check_pgresult
+#endif
error_check_string
+#ifdef NEW_GC
+error_check_string_direct_data
+error_check_string_indirect_data
+#endif
#endif
free_opaque_ptr
get_coding_system_for_text_file
＠＠ -150,7 +160,7 ＠＠
vector2
vector3
warn_when_safe
-#ifdef DEBUG_XEMACS
+#ifdef ERROR_CHECK_TYPES
wrap_record_1
#endif
write_c_string
＠＠ -196,7 +206,7 ＠＠
Fsignal
Fthrow
Fvector
-#ifdef DEBUG_XEMACS
+#ifdef ERROR_CHECK_TYPES
XINT_1
#endif
--
Marcus
3:46 p.m.
New subject: [PATCH] repair xemacs.def.in.in (was: Implicit INLINE_HEADERS in modules don't get instantiated)
--- Marcus Crestani <crestani(a)informatik.uni-tuebingen.de> wrote:
>>>>>"RR" == Rick Rankin
<rrankin1424-xemacs(a)yahoo.com> writes:
RR> I have no idea whether or not this is the right thing to do, but
RR> it works for Cygwin.
I see some problems with Rick's patch:
RR> #ifdef DEBUG_XEMACS
RR> eq_with_ebola_notice /* EQ_WITH_EBOLA_NOTICE */
RR> +error_check_cons
The error_check_* symbols have to be conditioned on ERROR_CHECK_TYPES,
not on DEBUG_XEMACS.
RR> +error_check_ldap
This has to be conditioned on HAVE_LDAP. Only with HAVE_LDAP the
lrecord type `ldap' gets instantiated in inline.c.
RR> +error_check_pgconn
RR> +error_check_pgresult
This has to be conditioned on HAVA_POSTGRESQL, for the same reason as
above.
RR> +error_check_string
The new GC string implementation requires that two more symbols are
added: error_check_direct_string_data and
error_check_indirect_string_data.
RR> +#ifdef DEBUG_XEMACS
RR> +wrap_record_1
RR> +#endif
[...]
RR> +#ifdef DEBUG_XEMACS
RR> +XINT_1
RR> +#endif
Both symbols have to be conditioned on ERROR_CHECK_TYPES.
Thanks, Marcus, and good catch. I should've been more careful ;-)
--Rick
11:29 a.m.
New subject: [AC21.5] repair xemacs.def.in.in
APPROVE COMMIT 21.5
>>>>"MC" == Marcus Crestani
<crestani(a)informatik.uni-tuebingen.de> writes:
MC> src/ChangeLog addition:
MC> 2005-11-29 Marcus Crestani <crestani(a)xemacs.org>
MC> * xemacs.def.in.in: Condition error_check_* symbols on
MC> ERROR_CHECK_TYPES.
I've committed this.
--
Marcus
6961
days inactive
6962
days old
4 comments
3 participants
participants (3)
-
Marcus Crestani -
Rick Rankin -
Stephen J. Turnbull