Mercurial > hg > octave-avbm
changeset 4184:e4b7578e5fc7
[project @ 2002-11-15 20:58:50 by jwe]
author | jwe |
---|---|
date | Fri, 15 Nov 2002 20:58:50 +0000 |
parents | 4427d432e220 |
children | 8f6d418d31c3 |
files | liboctave/ChangeLog liboctave/oct-shlib.cc scripts/ChangeLog scripts/image/image.m |
diffstat | 4 files changed, 22 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2002-11-15 John W. Eaton <jwe@bevo.che.wisc.edu> + + * oct-shlib.cc (octave_dlopen_shlib::open): Use RTLD_GLOBAL too. + From Remy Bruno <remy.bruno@libertysurf.fr> + 2002-11-14 John W. Eaton <jwe@bevo.che.wisc.edu> * lo-specfun.cc: Use F77_FUNC instead of F77_XFCN for calls to
--- a/liboctave/oct-shlib.cc +++ b/liboctave/oct-shlib.cc @@ -44,9 +44,6 @@ extern void *dlsym (void *, const char *); extern int dlclose (void *); #endif -#ifndef RTLD_LAZY -#define RTLD_LAZY 1 -#endif #elif defined (HAVE_SHL_LOAD_API) #include <dl.h> #endif @@ -244,7 +241,17 @@ { file = f; - library = dlopen (file.c_str (), RTLD_LAZY); + int flags = 0; + +#if defined (RTLD_LAZY) + flags |= RTLD_LAZY +#endif + +#if defined (RTLD_GLOBAL) + flags |= RTLD_GLOBAL +#endif + + library = dlopen (file.c_str (), flags); if (library) stamp_time (warn_future);
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2002-11-15 John W. Eaton <jwe@bevo.che.wisc.edu> + + * image/image.m: Use -raw option for xv. + From Remy Bruno <remy.bruno@libertysurf.fr> + 2002-11-12 John W. Eaton <jwe@bevo.che.wisc.edu> * control/base/lsim.m: Use approximate test for step size change.
--- a/scripts/image/image.m +++ b/scripts/image/image.m @@ -73,7 +73,7 @@ ## Start the viewer. Try display, xv, then xloadimage. - xv = sprintf ("xv -expand %f %s", zoom, ppm_name); + xv = sprintf ("xv -raw -expand %f %s", zoom, ppm_name); xloadimage = sprintf ("xloadimage -zoom %f %s", zoom*100, ppm_name);