Mercurial > octave-nkf
view libinterp/link-deps.mk @ 20500:44eb1102f8a8
don't recycle scanf format string if all conversions are done (bug #45808)
* oct-stream.cc, oct-stream.h (scanf_format_elt::special_conversion):
New enum value, no_conversion.
(scanf_format_list::next): If not cycling through the list, return
dummy scanf_format_elt after list has been exhausted.
(octave_base_stream::do_scanf): Only cycle through the format list
more than once if there are conversions to make and the limit on the
number of values to convert has not been reached.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 26 Aug 2015 16:05:49 -0400 |
parents | 0ce7d8303152 |
children | b65888ec820e |
line wrap: on
line source
if AMCOND_ENABLE_DYNAMIC_LINKING LIBOCTINTERP_LINK_DEPS = else LIBOCTINTERP_LINK_DEPS = $(DLDFCN_LIBS) endif LIBOCTINTERP_LINK_DEPS += \ $(FT2_LIBS) \ $(HDF5_LIBS) \ $(Z_LIBS) \ $(FFTW_XLIBS) \ $(OPENGL_LIBS) \ $(X11_LIBS) \ $(CARBON_LIBS) \ $(GL2PS_LIBS) \ $(LLVM_LIBS) \ $(JAVA_LIBS) \ $(LAPACK_LIBS) LIBOCTINTERP_LINK_OPTS = \ $(FT2_LDFLAGS) \ $(HDF5_LDFLAGS) \ $(Z_LDFLAGS) \ $(FFTW_XLDFLAGS) \ $(LLVM_LDFLAGS) OCT_LINK_DEPS = OCT_LINK_OPTS = $(LDFLAGS) if AMCOND_LINK_ALL_DEPS LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS) LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS) OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS) OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS) OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS) OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) endif