Mercurial > octave-nkf
changeset 6110:8e5edd73e504
[project @ 2006-10-27 02:23:35 by jwe]
| author | jwe |
|---|---|
| date | Fri, 27 Oct 2006 02:23:35 +0000 |
| parents | c68896f193e3 |
| children | ed81d74118bb |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 21 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Oct 27 02:16:19 2006 +0000 +++ b/ChangeLog Fri Oct 27 02:23:35 2006 +0000 @@ -1,3 +1,9 @@ +2006-10-26 John W. Eaton <jwe@octave.org> + + * configure.in (OCTAVE_EXPORT, OCTAVE_IMPORT): New macros + (CRUFT_API, OCTAVE_API, OCTINTERP_API): Define using OCTAVE_EXPORT + and OCTAVE_IMPORT. + 2006-10-26 Michael Goffioul <michael.goffioul@swing.be> * configure.in (*-*-msdosmsvc): Set library_path_var.
--- a/configure.in Fri Oct 27 02:16:19 2006 +0000 +++ b/configure.in Fri Oct 27 02:23:35 2006 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.538 $) +AC_REVISION($Revision: 1.539 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1896,29 +1896,31 @@ #pragma warning (disable: 4996) /* deprecated function names (FIXME?) */ #pragma warning (disable: 4661) +#define OCTAVE_EXPORT __declspec(dllexport) +#define OCTAVE_IMPORT __declspec(dllimport) +#else +/* All other compilers */ +#define OCTAVE_EXPORT +#define OCTAVE_IMPORT +#endif + /* API macro for libcruft */ #ifdef CRUFT_DLL -#define CRUFT_API __declspec(dllexport) +#define CRUFT_API OCTAVE_EXPORT #else -#define CRUFT_API __declspec(dllimport) +#define CRUFT_API OCTAVE_IMPORT #endif /* API macro for liboctave */ #ifdef OCTAVE_DLL -#define OCTAVE_API __declspec(dllexport) +#define OCTAVE_API OCTAVE_EXPORT #else -#define OCTAVE_API __declspec(dllimport) +#define OCTAVE_API OCTAVE_IMPORT #endif /* API macro for src */ #ifdef OCTINTERP_DLL -#define OCTINTERP_API __declspec(dllexport) -#else -#define OCTINTERP_API __declspec(dllimport) -#endif +#define OCTINTERP_API OCTAVE_EXPORT #else -/* All other compilers */ -#define OCTAVE_API -#define OCTINTERP_API -#define CRUFT_API +#define OCTINTERP_API OCTAVE_IMPORT #endif #include "oct-types.h"