summaryrefslogtreecommitdiffstats
path: root/win/tclWinLoad.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-09-13 14:20:38 (GMT)
committernijtmans <nijtmans>2010-09-13 14:20:38 (GMT)
commit977fd8496d174524a12ac1d1bda9ef02b2194503 (patch)
tree03d8642b19420af74dc2a6df0008c01cb554ad79 /win/tclWinLoad.c
parent4b90c100d6369a76746f961863759d9c26d4c3eb (diff)
downloadtcl-977fd8496d174524a12ac1d1bda9ef02b2194503.zip
tcl-977fd8496d174524a12ac1d1bda9ef02b2194503.tar.gz
tcl-977fd8496d174524a12ac1d1bda9ef02b2194503.tar.bz2
Various clean-ups, converting from tclWinProc->xxxProc directly to Xxx
(no change in functionality)
Diffstat (limited to 'win/tclWinLoad.c')
-rw-r--r--win/tclWinLoad.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index 6fd44d1..cb46db9 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.31 2010/08/04 19:35:22 hobbs Exp $
+ * RCS: @(#) $Id: tclWinLoad.c,v 1.32 2010/09/13 14:20:39 nijtmans Exp $
*/
#include "tclWinInt.h"
@@ -77,7 +77,7 @@ TclpDlopen(
*/
nativeName = Tcl_FSGetNativePath(pathPtr);
- hInstance = tclWinProcs->loadLibraryExProc(nativeName, NULL,
+ hInstance = LoadLibraryEx(nativeName, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
if (hInstance == NULL) {
/*
@@ -89,8 +89,8 @@ TclpDlopen(
Tcl_DString ds;
const char *fileName = Tcl_GetString(pathPtr);
- nativeName = tclWinProcs->utf2tchar(fileName, -1, &ds);
- hInstance = tclWinProcs->loadLibraryExProc(nativeName, NULL,
+ nativeName = Tcl_WinUtfToTChar(fileName, -1, &ds);
+ hInstance = LoadLibraryEx(nativeName, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
Tcl_DStringFree(&ds);
}
@@ -150,7 +150,7 @@ TclpDlopen(
}
return TCL_ERROR;
} else {
- handlePtr =
+ handlePtr =
(Tcl_LoadHandle) ckalloc(sizeof(struct Tcl_LoadHandle_));
handlePtr->clientData = (ClientData) hInstance;
handlePtr->findSymbolProcPtr = &FindSymbol;
@@ -358,7 +358,7 @@ TclpTempFileNameForLibrary(Tcl_Interp* interp, /* Tcl interpreter */
Tcl_AppendToObj(fileName, "/", 1);
Tcl_AppendObjToObj(fileName, tail);
return fileName;
- }
+ }
}
/*