diff options
| author | Steve Bennett <steveb@workware.net.au> | 2009-07-28 16:22:31 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2010-10-15 10:11:02 +1000 |
| commit | 6461e8bf6ddf82ee974b4c63458915490d74a5ce (patch) | |
| tree | 27840de122ee2ef0e8a5bc9ac6940615508324d1 /jim-package.c | |
| parent | 8df2449dc136716024d3423d8c1b5412759293a1 (diff) | |
| download | jimtcl-6461e8bf6ddf82ee974b4c63458915490d74a5ce.zip jimtcl-6461e8bf6ddf82ee974b4c63458915490d74a5ce.tar.gz jimtcl-6461e8bf6ddf82ee974b4c63458915490d74a5ce.tar.bz2 | |
Small improvements
Save (but then cleanup) generated extensions
Add package and readdir to 'all' extensions
Order of static extensions matters!!
Simple C define support for configured extensions
Fix some compiler warnings
Diffstat (limited to 'jim-package.c')
| -rw-r--r-- | jim-package.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/jim-package.c b/jim-package.c index 4474381..3c206df 100644 --- a/jim-package.c +++ b/jim-package.c @@ -75,7 +75,7 @@ static int JimLoadPackage(Jim_Interp *interp, const char *name, int flags) { Jim_Obj *libPathObjPtr; char **prefixes, *path; - int prefixc, i, retCode = JIM_OK; + int prefixc, i, retCode = JIM_ERR; libPathObjPtr = Jim_GetGlobalVariableStr(interp, "jim_libpath", JIM_NONE); if (libPathObjPtr == NULL) { @@ -105,13 +105,16 @@ static int JimLoadPackage(Jim_Interp *interp, const char *name, int flags) /* Try to load/source it */ if (p && strcmp(p, ".tcl") == 0) { retCode = Jim_EvalFile(interp, path); - } else { + } +#ifdef with_jim_ext_load + else { retCode = Jim_LoadLibrary(interp, path); } +#endif + Jim_Free(path); } else { retCode = JIM_ERR; } - Jim_Free(path); for (i = 0; i < prefixc; i++) Jim_Free(prefixes[i]); Jim_Free(prefixes); |