# HG changeset patch # User jwe # Date 1181107134 0 # Node ID 768d3ad80bbf51bcc23d5a024f9d3c4838242413 # Parent 89b916a9eb61d1f43f6b35420978c17e4ad7ae32 [project @ 2007-06-06 05:18:54 by jwe] diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog --- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2007-06-06 Michael Goffioul + + * MArray-C.cc: Sprinkle with OCTINTERP_API as needed. + 2007-06-04 David Bateman * Sparse.cc (Sparse Sparse::reshape): If length of new diff --git a/liboctave/MArray-C.cc b/liboctave/MArray-C.cc --- a/liboctave/MArray-C.cc +++ b/liboctave/MArray-C.cc @@ -41,7 +41,7 @@ #include "MArray.cc" template <> -double +OCTAVE_API double MArray::norm (double p) const { MARRAY_NORM_BODY (Complex, xdznrm2, XDZNRM2); diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-06-06 Michael Goffioul + + * defaults.h.in, ls-hdf5.h, ov-complex.h, ov-cx-mat.h, ov-intx.h, + sysdep.h: Sprinkle with OCTINTERP_API as needed. + 2007-06-05 John W. Eaton * help.h (raw_help): Tag with OCTINTERP_API. diff --git a/src/defaults.h.in b/src/defaults.h.in --- a/src/defaults.h.in +++ b/src/defaults.h.in @@ -195,7 +195,7 @@ extern std::string Vsite_defaults_file; // Name of the FFTW wisdom program. -extern std::string Vfftw_wisdom_program; +extern OCTINTERP_API std::string Vfftw_wisdom_program; extern std::string subst_octave_home (const std::string&); diff --git a/src/ls-hdf5.h b/src/ls-hdf5.h --- a/src/ls-hdf5.h +++ b/src/ls-hdf5.h @@ -140,35 +140,35 @@ }; #if HAVE_HDF5_INT2FLOAT_CONVERSIONS -extern hid_t +extern OCTINTERP_API hid_t save_type_to_hdf5 (save_type st) #endif -extern hid_t +extern OCTINTERP_API hid_t hdf5_make_complex_type (hid_t num_type); -extern bool +extern OCTINTERP_API bool hdf5_types_compatible (hid_t t1, hid_t t2); -extern herr_t +extern OCTINTERP_API herr_t hdf5_read_next_data (hid_t group_id, const char *name, void *dv); -extern bool +extern OCTINTERP_API bool add_hdf5_data (hid_t loc_id, const octave_value& tc, const std::string& name, const std::string& doc, bool mark_as_global, bool save_as_floats); -extern int +extern OCTINTERP_API int save_hdf5_empty (hid_t loc_id, const char *name, const dim_vector d); -extern int +extern OCTINTERP_API int load_hdf5_empty (hid_t loc_id, const char *name, dim_vector &d); -extern std::string +extern OCTINTERP_API std::string read_hdf5_data (std::istream& is, const std::string& filename, bool& global, octave_value& tc, std::string& doc); -extern bool +extern OCTINTERP_API bool save_hdf5_data (std::ostream& os, const octave_value& tc, const std::string& name, const std::string& doc, bool mark_as_global, bool save_as_floats); diff --git a/src/ov-complex.h b/src/ov-complex.h --- a/src/ov-complex.h +++ b/src/ov-complex.h @@ -48,7 +48,7 @@ // Complex scalar values. class -OCTAVE_API +OCTINTERP_API octave_complex : public octave_base_scalar { public: diff --git a/src/ov-cx-mat.h b/src/ov-cx-mat.h --- a/src/ov-cx-mat.h +++ b/src/ov-cx-mat.h @@ -49,6 +49,7 @@ // Complex matrix values. class +OCTINTERP_API octave_complex_matrix : public octave_base_matrix { public: diff --git a/src/ov-intx.h b/src/ov-intx.h --- a/src/ov-intx.h +++ b/src/ov-intx.h @@ -39,6 +39,7 @@ #include "gripes.h" class +OCTINTERP_API OCTAVE_VALUE_INT_MATRIX_T : public octave_base_int_matrix { @@ -231,6 +232,7 @@ }; class +OCTINTERP_API OCTAVE_VALUE_INT_SCALAR_T : public octave_base_int_scalar { diff --git a/src/sysdep.h b/src/sysdep.h --- a/src/sysdep.h +++ b/src/sysdep.h @@ -35,7 +35,7 @@ extern void raw_mode (bool, bool wait = true); -extern int octave_kbhit (bool wait = true); +extern OCTINTERP_API int octave_kbhit (bool wait = true); extern void w32_set_quiet_shutdown (void);