From ba6029ea1140951656f838fc709ee35d6c4f66ef Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 19 Mar 2008 16:02:04 +0000
Subject: Corrected scoping of Tcl_GetMemoryInfo. [Bug 1868171]

---
 ChangeLog                | 3 +++
 generic/tcl.h            | 8 +++++++-
 generic/tclThreadAlloc.c | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c69293b..f31e2ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-19  Donal K. Fellows  <dkf@users.sf.net>
 
+	* generic/tcl.h, generic/tclThreadAlloc.c (Tcl_GetMemoryInfo): Make
+	sure this function is available when direct linking. [Bug 1868171]
+
 	* tests/reg.test (reg-33.14): Marked nonPortable because some
 	environments have small default stack sizes. [Bug 1905562]
 
diff --git a/generic/tcl.h b/generic/tcl.h
index 903a65f..7f33d22 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.250 2008/02/13 18:00:33 dgp Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.251 2008/03/19 16:02:05 dkf Exp $
  */
 
 #ifndef _TCL
@@ -2234,6 +2234,12 @@ EXTERN CONST char *Tcl_PkgInitStubsCheck _ANSI_ARGS_((Tcl_Interp *interp,
 			    CONST char *version, int exact));
 
 /*
+ * Tcl_GetMemoryInfo is needed for AOLserver. [Bug 1868171]
+ */
+
+EXTERN void Tcl_GetMemoryInfo _ANSI_ARGS_((Tcl_DString *dsPtr));
+
+/*
  * Include the public function declarations that are accessible via the stubs
  * table.
  */
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 3309058..f2a043c 100755
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclThreadAlloc.c,v 1.25 2007/12/17 15:28:28 msofer Exp $
+ * RCS: @(#) $Id: tclThreadAlloc.c,v 1.26 2008/03/19 16:02:05 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -608,7 +608,7 @@ TclThreadFreeObj(
  *----------------------------------------------------------------------
  */
 
-MODULE_SCOPE void
+void
 Tcl_GetMemoryInfo(
     Tcl_DString *dsPtr)
 {
-- 
cgit v0.12