From 3e878728b6f2a233820430cb70171be17bc5bd6a Mon Sep 17 00:00:00 2001 From: David Schultz Date: Sun, 20 Feb 2005 00:29:40 +0000 Subject: [PATCH] Remove more copies of Tcl's SunOS shared library hack. It's worth pointing out that the Tcl project used to *recommend* that application writers copy this kludge. These ports work fine with Tcl 8.3, which provided a fake matherr() even if the OS didn't, but here's what the Tcl 8.4 changelog has to say: 2002-05-31 (dead code)[474335,555635] removed all use of matherr() (english) *** POTENTIAL INCOMPATIBILITY *** The following lines can be safely removed from any application that has them, unless compatibility with SunOS 4.X is desired. extern int matherr(); int *tclDummyMathPtr = (int *) matherr; The build problems were pointed out by Kris, as usual. ;-) --- converters/xdeview/files/patch-ad | 17 +++++++++++++++++ lang/tclX/files/patch-ag | 18 ++++++++++++++++++ lang/tclX/files/patch-ah | 18 ++++++++++++++++++ palm/pilot-link-devel/files/patch-ac | 17 +++++++++++++++++ palm/pilot-link/files/patch-ac | 17 +++++++++++++++++ x11-toolkits/tix/files/patch-af | 16 ++++++++++++++++ 6 files changed, 103 insertions(+) create mode 100644 converters/xdeview/files/patch-ad create mode 100644 lang/tclX/files/patch-ag create mode 100644 lang/tclX/files/patch-ah create mode 100644 palm/pilot-link-devel/files/patch-ac create mode 100644 palm/pilot-link/files/patch-ac create mode 100644 x11-toolkits/tix/files/patch-af diff --git a/converters/xdeview/files/patch-ad b/converters/xdeview/files/patch-ad new file mode 100644 index 000000000000..9113510834a3 --- /dev/null +++ b/converters/xdeview/files/patch-ad @@ -0,0 +1,17 @@ +--- tcl/uutcl.c.orig Sat Feb 19 18:56:55 2005 ++++ tcl/uutcl.c Sat Feb 19 18:57:08 2005 +@@ -48,14 +48,6 @@ + #include + #endif + +-/* +- * The following variable is a special hack that is needed in order for +- * Sun shared libraries to be used for Tcl. +- */ +- +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; +- + #include + #include + #include diff --git a/lang/tclX/files/patch-ag b/lang/tclX/files/patch-ag new file mode 100644 index 000000000000..0ec2f3b27e5e --- /dev/null +++ b/lang/tclX/files/patch-ag @@ -0,0 +1,18 @@ +--- ../tcl/unix/tclXAppInit.c.orig Sat Feb 19 19:05:30 2005 ++++ ../tcl/unix/tclXAppInit.c Sat Feb 19 19:05:42 2005 +@@ -19,15 +19,6 @@ + + #include "tclExtend.h" + +-/* +- * The following variable is a special hack that insures the tcl +- * version of matherr() is used when linking against shared libraries. +- * Even if matherr is not used on this system, there is a dummy version +- * in libtcl. +- */ +-extern int matherr (); +-int (*tclDummyMathPtr)() = matherr; +- + + /*----------------------------------------------------------------------------- + * main -- diff --git a/lang/tclX/files/patch-ah b/lang/tclX/files/patch-ah new file mode 100644 index 000000000000..4fa51723eabf --- /dev/null +++ b/lang/tclX/files/patch-ah @@ -0,0 +1,18 @@ +--- ../tk/unix/tkXAppInit.c.orig Sat Feb 19 19:06:15 2005 ++++ ../tk/unix/tkXAppInit.c Sat Feb 19 19:06:22 2005 +@@ -21,15 +21,6 @@ + #include "tclExtend.h" + #include "tk.h" + +-/* +- * The following variable is a special hack that insures the tcl +- * version of matherr() is used when linking against shared libraries +- * Even if matherr is not used on this system, there is a dummy version +- * in libtcl. +- */ +-extern int matherr (); +-int (*tclDummyMathPtr)() = matherr; +- + + /*----------------------------------------------------------------------------- + * main -- diff --git a/palm/pilot-link-devel/files/patch-ac b/palm/pilot-link-devel/files/patch-ac new file mode 100644 index 000000000000..c0f239e99c7f --- /dev/null +++ b/palm/pilot-link-devel/files/patch-ac @@ -0,0 +1,17 @@ +--- bindings/Tcl/tclAppInit.c.orig Sat Feb 19 19:14:05 2005 ++++ bindings/Tcl/tclAppInit.c Sat Feb 19 19:14:16 2005 +@@ -15,14 +15,6 @@ + + #include "tcl.h" + +-/* +- * The following variable is a special hack that is needed in order for +- * Sun shared libraries to be used for Tcl. +- */ +- +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; +- + EXTERN int Pitcl_Init _ANSI_ARGS_((Tcl_Interp *interp)); + + #ifdef TCL_TEST diff --git a/palm/pilot-link/files/patch-ac b/palm/pilot-link/files/patch-ac new file mode 100644 index 000000000000..c0f239e99c7f --- /dev/null +++ b/palm/pilot-link/files/patch-ac @@ -0,0 +1,17 @@ +--- bindings/Tcl/tclAppInit.c.orig Sat Feb 19 19:14:05 2005 ++++ bindings/Tcl/tclAppInit.c Sat Feb 19 19:14:16 2005 +@@ -15,14 +15,6 @@ + + #include "tcl.h" + +-/* +- * The following variable is a special hack that is needed in order for +- * Sun shared libraries to be used for Tcl. +- */ +- +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; +- + EXTERN int Pitcl_Init _ANSI_ARGS_((Tcl_Interp *interp)); + + #ifdef TCL_TEST diff --git a/x11-toolkits/tix/files/patch-af b/x11-toolkits/tix/files/patch-af new file mode 100644 index 000000000000..c72933c2773e --- /dev/null +++ b/x11-toolkits/tix/files/patch-af @@ -0,0 +1,16 @@ +--- tixAppInit.c.orig Sat Feb 19 18:28:15 2005 ++++ tixAppInit.c Sat Feb 19 18:28:23 2005 +@@ -22,13 +22,6 @@ + #include "itk.h" + #include + +-/* +- * The following variable is a special hack that is needed in order for +- * Sun shared libraries to be used for Tcl. +- */ +- +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; + + /* + *----------------------------------------------------------------------