diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-09-29 19:30:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-09-29 19:30:10 +0000 |
| commit | 444119dbcb8228e5a47b6e00f7932aa04759b13d (patch) | |
| tree | 6503a9fd9f6fe04381549206152314fc9dd5454b /config.h.win32 | |
| parent | 28a6169ff7a93618819a83dd03695b8f8d41f8a8 (diff) | |
From Lars Roland: add an option to link plugins with libethereal rather
than using the plugin address table.
svn path=/trunk/; revision=12139
Diffstat (limited to 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/config.h.win32 b/config.h.win32 index c6d4d9cee1..02e5719e59 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -33,6 +33,16 @@ #define HAVE_PLUGINS 1 #define PLUGINS_NEED_ADDRESS_TABLE 1 +/* Plugins can also use the import library of libethereal.dll instead + of the old API. In that case we undefine PLUGINS_NEED_ADDRESS_TABLE + for the plugin. We don't undefine PLUGINS_NEED_ADDRESS_TABLE globally. + Thus Ethereal will be still able to load plugins using the old API. + The macro HAVE_WIN32_LIBETHEREAL_LIB has to be defined in plugin's + makefile.nmake. A template is available in doc/README.plugins */ +#ifdef HAVE_WIN32_LIBETHEREAL_LIB +#undef PLUGINS_NEED_ADDRESS_TABLE +#endif + /* #undef HAVE_SA_LEN */ /* #undef NEED_SNPRINTF_H */ @@ -169,17 +179,6 @@ /* Define to use the PCRE library */ @HAVE_PCRE@ -@HAVE_LIBETHEREALDLL@ - -/* define macro for importing variables from an dll - * it depends on HAVE_LIBETHEREAL and _NEED_VAR_IMPORT_ - */ -#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBETHEREALDLL) -# define ETH_VAR_IMPORT __declspec(dllimport) extern -#else -# define ETH_VAR_IMPORT extern -#endif - #ifndef WIN32 #define WIN32 1 #endif |