Mercurial > octave
diff src/defun-int.h @ 7996:6a7db240b3a3
configure.in: eliminate CXX_ABI and OCTAVE_CXX_PREPEND_UNDERSCORE
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 30 Jul 2008 14:13:45 -0400 |
| parents | 8c32f95c2639 |
| children | f134925a1cfa |
line wrap: on
line diff
--- a/src/defun-int.h Wed Jul 30 12:08:03 2008 -0400 +++ b/src/defun-int.h Wed Jul 30 14:13:45 2008 -0400 @@ -73,42 +73,13 @@ typedef octave_function * (*octave_dld_fcn_getter) (const octave_shlib&, bool relative); #define DEFINE_FUN_INSTALLER_FUN(name, doc) \ - DEFINE_FUN_INSTALLER_FUN2(name, doc, CXX_ABI) - -#define DEFINE_FUN_INSTALLER_FUN2(name, doc, cxx_abi) \ - DEFINE_FUN_INSTALLER_FUN3(name, doc, cxx_abi) - -#define DEFINE_FUN_INSTALLER_FUN3(name, doc, cxx_abi) \ - DEFINE_FUNX_INSTALLER_FUN3(#name, F ## name, FS ## name, G ## name, doc, cxx_abi) - -#define DEFINE_FUNX_INSTALLER_FUN(name, fname, fsname, gname, doc) \ - DEFINE_FUNX_INSTALLER_FUN2(name, fname, fsname, gname, doc, CXX_ABI) - -#define DEFINE_FUNX_INSTALLER_FUN2(name, fname, fsname, gname, doc, cxx_abi) \ - DEFINE_FUNX_INSTALLER_FUN3(name, fname, fsname, gname, doc, cxx_abi) + DEFINE_FUNX_INSTALLER_FUN(#name, F ## name, G ## name, doc) -#define DEFINE_FUNX_INSTALLER_FUN3(name, fname, fsname, gname, doc, cxx_abi) \ - extern "C" \ - OCTAVE_EXPORT \ - bool \ - fsname ## _ ## cxx_abi (const octave_shlib& shl, bool relative) \ - { \ - bool retval = true; \ - \ - check_version (OCTAVE_API_VERSION, name); \ - \ - if (error_state) \ - retval = false; \ - else \ - install_dld_function (fname, name, shl, doc, false, relative); \ - \ - return retval; \ - } \ - \ +#define DEFINE_FUNX_INSTALLER_FUN(name, fname, gname, doc) \ extern "C" \ OCTAVE_EXPORT \ octave_function * \ - gname ## _ ## cxx_abi (const octave_shlib& shl, bool relative) \ + gname (const octave_shlib& shl, bool relative) \ { \ octave_function *retval = 0; \ \