summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvincentdarley <vincentdarley>2002-07-18 16:26:00 (GMT)
committervincentdarley <vincentdarley>2002-07-18 16:26:00 (GMT)
commit4bb72e7bf13c65b6744c9dd1ab7580494cfeaa69 (patch)
tree637913dec4ebf406528191827f1ccc5700d994e7
parent20201e313950ca2b4b8af678b6527c4c14c8f7c5 (diff)
downloadtcl-4bb72e7bf13c65b6744c9dd1ab7580494cfeaa69.zip
tcl-4bb72e7bf13c65b6744c9dd1ab7580494cfeaa69.tar.gz
tcl-4bb72e7bf13c65b6744c9dd1ab7580494cfeaa69.tar.bz2
Tcl_LoadHandle usage
-rw-r--r--ChangeLog4
-rw-r--r--generic/tcl.h6
-rw-r--r--generic/tclIOUtil.c10
-rw-r--r--generic/tclInt.h8
-rw-r--r--generic/tclLoadNone.c8
-rw-r--r--mac/tclMacLoad.c10
-rw-r--r--unix/tclLoadAout.c8
-rw-r--r--unix/tclLoadDl.c10
-rw-r--r--unix/tclLoadDld.c8
-rw-r--r--unix/tclLoadDyld.c10
-rw-r--r--unix/tclLoadNext.c10
-rw-r--r--unix/tclLoadOSF.c8
-rw-r--r--unix/tclLoadShl.c10
-rw-r--r--win/tclWinLoad.c10
14 files changed, 60 insertions, 60 deletions
diff --git a/ChangeLog b/ChangeLog
index 2118d1d..ddcb4a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
* generic/tclInt.h:
* generic/tcl.h:
* */*Load*.c: added comments on changes of 07/17 and
- replaced clientData with TclLoadHandle in all locations.
+ replaced clientData with Tcl_LoadHandle in all locations.
* generic/tclFCmd.c:
* tests/fileSystem.test: fixed a 'knownBug' with 'file
@@ -46,7 +46,7 @@
* mac/tclMacLoad.c:
* win/tclWinLoad.c: modified to move more functionality
to the generic code and avoid duplication. Partial replacement
- of internal uses of clientData with opaque TclLoadHandle. A
+ of internal uses of clientData with opaque Tcl_LoadHandle. A
little further work still needed, but significant changes are done.
2002-07-17 D. Richard Hipp <drh@hwaci.com>
diff --git a/generic/tcl.h b/generic/tcl.h
index 2995ed1..38219b7 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.134 2002/07/18 15:06:54 vincentdarley Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.135 2002/07/18 16:26:02 vincentdarley Exp $
*/
#ifndef _TCL
@@ -459,7 +459,7 @@ typedef struct Tcl_TimerToken_ *Tcl_TimerToken;
typedef struct Tcl_Trace_ *Tcl_Trace;
typedef struct Tcl_Var_ *Tcl_Var;
typedef struct Tcl_ChannelTypeVersion_ *Tcl_ChannelTypeVersion;
-typedef struct TclLoadHandle_ *TclLoadHandle;
+typedef struct Tcl_LoadHandle_ *Tcl_LoadHandle;
/*
* Definition of the interface to procedures implementing threads.
@@ -1598,7 +1598,7 @@ typedef int (Tcl_FSRemoveDirectoryProc) _ANSI_ARGS_((Tcl_Obj *pathPtr,
int recursive, Tcl_Obj **errorPtr));
typedef int (Tcl_FSRenameFileProc) _ANSI_ARGS_((Tcl_Obj *srcPathPtr,
Tcl_Obj *destPathPtr));
-typedef void (Tcl_FSUnloadFileProc) _ANSI_ARGS_((TclLoadHandle loadHandle));
+typedef void (Tcl_FSUnloadFileProc) _ANSI_ARGS_((Tcl_LoadHandle loadHandle));
typedef Tcl_Obj* (Tcl_FSListVolumesProc) _ANSI_ARGS_((void));
/* We have to declare the utime structure here. */
struct utimbuf;
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 5465dcc..dea7cff 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,7 +17,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOUtil.c,v 1.58 2002/07/18 15:14:35 vincentdarley Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.59 2002/07/18 16:26:03 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -514,7 +514,7 @@ static Tcl_FSUnloadFileProc FSUnloadTempFile;
* operation when we want to unload the code.
*/
typedef struct FsDivertLoad {
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
Tcl_FSUnloadFileProc *unloadProcPtr;
Tcl_Obj *divertedFile;
Tcl_Filesystem *divertedFilesystem;
@@ -2557,7 +2557,7 @@ Tcl_FSLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr,
* Tcl_DecrRefCount(perm);
*
*/
- TclLoadHandle newLoadHandle = NULL;
+ Tcl_LoadHandle newLoadHandle = NULL;
Tcl_FSUnloadFileProc *newUnloadProcPtr = NULL;
FsDivertLoad *tvdlPtr;
int retVal;
@@ -2650,7 +2650,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr,
* function which should be used for
* this file. */
{
- TclLoadHandle handle = NULL;
+ Tcl_LoadHandle handle = NULL;
int res;
res = TclpDlopen(interp, pathPtr, &handle, unloadProcPtr);
@@ -2691,7 +2691,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr,
*/
static void
FSUnloadTempFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to Tcl_FSLoadFile(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 7400ce0..cef4a74 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclInt.h,v 1.105 2002/07/18 15:09:44 vincentdarley Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.106 2002/07/18 16:26:03 vincentdarley Exp $
*/
#ifndef _TCLINT
@@ -1811,7 +1811,7 @@ EXTERN char * TclpReadlink _ANSI_ARGS_((CONST char *fileName,
Tcl_DString *linkPtr));
EXTERN void TclpReleaseFile _ANSI_ARGS_((TclFile file));
EXTERN void TclpSetVariables _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN void TclpUnloadFile _ANSI_ARGS_((TclLoadHandle loadHandle));
+EXTERN void TclpUnloadFile _ANSI_ARGS_((Tcl_LoadHandle loadHandle));
EXTERN VOID * TclpThreadDataKeyGet _ANSI_ARGS_((
Tcl_ThreadDataKey *keyPtr));
EXTERN void TclpThreadDataKeyInit _ANSI_ARGS_((
@@ -1832,10 +1832,10 @@ EXTERN Tcl_Obj* TclpNativeToNormalized
EXTERN Tcl_Obj* TclpFilesystemPathType
_ANSI_ARGS_((Tcl_Obj* pathObjPtr));
EXTERN Tcl_PackageInitProc* TclpFindSymbol _ANSI_ARGS_((Tcl_Interp *interp,
- TclLoadHandle loadHandle, CONST char *symbol));
+ Tcl_LoadHandle loadHandle, CONST char *symbol));
EXTERN int TclpDlopen _ANSI_ARGS_((Tcl_Interp *interp,
Tcl_Obj *pathPtr,
- TclLoadHandle *loadHandle,
+ Tcl_LoadHandle *loadHandle,
Tcl_FSUnloadFileProc **unloadProcPtr));
/*
diff --git a/generic/tclLoadNone.c b/generic/tclLoadNone.c
index 878711c..4507b06 100644
--- a/generic/tclLoadNone.c
+++ b/generic/tclLoadNone.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadNone.c,v 1.10 2002/07/18 15:04:53 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadNone.c,v 1.11 2002/07/18 16:26:03 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -39,7 +39,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -71,7 +71,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
return NULL;
@@ -127,7 +127,7 @@ TclGuessPackageName(fileName, bufPtr)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/mac/tclMacLoad.c b/mac/tclMacLoad.c
index 0b411e0..3c2ec37 100644
--- a/mac/tclMacLoad.c
+++ b/mac/tclMacLoad.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacLoad.c,v 1.14 2002/07/18 15:04:53 vincentdarley Exp $
+ * RCS: @(#) $Id: tclMacLoad.c,v 1.15 2002/07/18 16:26:04 vincentdarley Exp $
*/
#include <CodeFragments.h>
@@ -120,7 +120,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr)
@@ -152,7 +152,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
return TCL_ERROR;
}
- *loadHandle = (TclLoadHandle)loadInfo;
+ *loadHandle = (Tcl_LoadHandle)loadInfo;
*unloadProcPtr = &TclpUnloadFile;
return TCL_OK;
}
@@ -272,7 +272,7 @@ TryToLoad(Tcl_Interp *interp, TclMacLoadInfo *loadInfo,
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
Tcl_DString ds;
@@ -331,7 +331,7 @@ TclpFindSymbol(interp, loadHandle, symbol)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/unix/tclLoadAout.c b/unix/tclLoadAout.c
index b8fa8b6..301dce9 100644
--- a/unix/tclLoadAout.c
+++ b/unix/tclLoadAout.c
@@ -14,7 +14,7 @@
* and Design Engineering (MADE) Initiative through ARPA contract
* F33615-94-C-4400.
*
- * RCS: @(#) $Id: tclLoadAout.c,v 1.12 2002/07/18 15:04:53 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadAout.c,v 1.13 2002/07/18 16:26:04 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -142,7 +142,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -327,7 +327,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
/* Look up the entry point in the load module's dictionary. */
@@ -462,7 +462,7 @@ UnlinkSymbolTable ()
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index c7402aa..2f1d4e2 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadDl.c,v 1.11 2002/07/18 15:04:53 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadDl.c,v 1.12 2002/07/18 16:26:04 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -58,7 +58,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -80,7 +80,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
}
*unloadProcPtr = &TclpUnloadFile;
- *loadHandle = (TclLoadHandle)handle;
+ *loadHandle = (Tcl_LoadHandle)handle;
return TCL_OK;
}
@@ -102,7 +102,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
CONST char *native;
@@ -151,7 +151,7 @@ TclpFindSymbol(interp, loadHandle, symbol)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/unix/tclLoadDld.c b/unix/tclLoadDld.c
index de0ab6d..9603e7e 100644
--- a/unix/tclLoadDld.c
+++ b/unix/tclLoadDld.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadDld.c,v 1.10 2002/07/18 15:04:53 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadDld.c,v 1.11 2002/07/18 16:26:04 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -50,7 +50,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -114,7 +114,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
return (Tcl_PackageInitProc *) dld_get_func(symbol);
@@ -140,7 +140,7 @@ TclpFindSymbol(interp, loadHandle, symbol)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index e220525..600bbb3 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.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: tclLoadDyld.c,v 1.10 2002/07/18 15:04:53 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadDyld.c,v 1.11 2002/07/18 16:26:04 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -41,7 +41,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -64,7 +64,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_AppendResult(interp, msg, (char *) NULL);
return TCL_ERROR;
}
- *loadHandle = (TclLoadHandle)dyld_lib;
+ *loadHandle = (Tcl_LoadHandle)dyld_lib;
*unloadProcPtr = &TclpUnloadFile;
return TCL_OK;
}
@@ -87,7 +87,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
NSSymbol nsSymbol;
@@ -137,7 +137,7 @@ TclpFindSymbol(interp, loadHandle, symbol)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
index 67d7e18..699cfb3 100644
--- a/unix/tclLoadNext.c
+++ b/unix/tclLoadNext.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadNext.c,v 1.9 2002/07/18 15:04:54 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadNext.c,v 1.10 2002/07/18 16:26:04 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -40,7 +40,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -63,7 +63,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
}
NXCloseMemory(errorStream,NX_FREEBUFFER);
- *loadHandle = (TclLoadHandle)1; /* A dummy non-NULL value */
+ *loadHandle = (Tcl_LoadHandle)1; /* A dummy non-NULL value */
*unloadProcPtr = &TclpUnloadFile;
return TCL_OK;
@@ -87,7 +87,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
Tcl_PackageInitProc *proc=NULL;
@@ -119,7 +119,7 @@ TclpFindSymbol(interp, loadHandle, symbol)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
index 45d8ad6..7e7c6d4 100644
--- a/unix/tclLoadOSF.c
+++ b/unix/tclLoadOSF.c
@@ -31,7 +31,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadOSF.c,v 1.9 2002/07/18 15:04:54 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadOSF.c,v 1.10 2002/07/18 16:26:04 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -61,7 +61,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -118,7 +118,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
return ldr_lookup_package((char *)loadHandle, symbol);
@@ -144,7 +144,7 @@ TclpFindSymbol(interp, loadHandle, symbol)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
index 9baadc6..84ef9fa 100644
--- a/unix/tclLoadShl.c
+++ b/unix/tclLoadShl.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadShl.c,v 1.11 2002/07/18 15:04:54 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadShl.c,v 1.12 2002/07/18 16:26:04 vincentdarley Exp $
*/
#include <dl.h>
@@ -48,7 +48,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -77,7 +77,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
"\": ", Tcl_PosixError(interp), (char *) NULL);
return TCL_ERROR;
}
- *loadHandle = (TclLoadHandle) handle;
+ *loadHandle = (Tcl_LoadHandle) handle;
*unloadProcPtr = &TclpUnloadFile;
return TCL_OK;
}
@@ -100,7 +100,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
Tcl_DString newName;
@@ -146,7 +146,7 @@ TclpFindSymbol(interp, loadHandle, symbol)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index 620aa6c..acbdecc 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinLoad.c,v 1.13 2002/07/18 15:04:54 vincentdarley Exp $
+ * RCS: @(#) $Id: tclWinLoad.c,v 1.14 2002/07/18 16:26:05 vincentdarley Exp $
*/
#include "tclWinInt.h"
@@ -39,7 +39,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_Interp *interp; /* Used for error reporting. */
Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- TclLoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
* file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
Tcl_FSUnloadFileProc **unloadProcPtr;
@@ -56,7 +56,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
handle = (*tclWinProcs->loadLibraryProc)(nativeName);
Tcl_DStringFree(&ds);
- *loadHandle = (TclLoadHandle) handle;
+ *loadHandle = (Tcl_LoadHandle) handle;
if (handle == NULL) {
DWORD lastError = GetLastError();
@@ -131,7 +131,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
Tcl_PackageInitProc*
TclpFindSymbol(interp, loadHandle, symbol)
Tcl_Interp *interp;
- TclLoadHandle loadHandle;
+ Tcl_LoadHandle loadHandle;
CONST char *symbol;
{
Tcl_PackageInitProc *proc = NULL;
@@ -174,7 +174,7 @@ TclpFindSymbol(interp, loadHandle, symbol)
void
TclpUnloadFile(loadHandle)
- TclLoadHandle loadHandle; /* loadHandle returned by a previous call
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
* to TclpDlopen(). The loadHandle is
* a token that represents the loaded
* file. */