diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-06-20 18:30:54 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-06-20 18:30:54 +0000 |
| commit | f7e38bd5e65ca78ca1ff385a403b2eb01255c697 (patch) | |
| tree | d60c188ff951ee2301f647bee53310e2c80af4c3 /config.h.win32 | |
| parent | 797bb2d5d7cfcaf497585bd68afe1d37d96b9852 (diff) | |
| download | wireshark-f7e38bd5e65ca78ca1ff385a403b2eb01255c697.tar.gz wireshark-f7e38bd5e65ca78ca1ff385a403b2eb01255c697.tar.bz2 wireshark-f7e38bd5e65ca78ca1ff385a403b2eb01255c697.zip | |
Change ETH_VAR_IMPORT to WS_VAR_IMPORT. Try to fix a duplicate variable
definition in the Catapult DCT2000 code.
svn path=/trunk/; revision=18524
Diffstat (limited to 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.h.win32 b/config.h.win32 index 0908b2549d..50805365a0 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -70,9 +70,9 @@ * it depends on HAVE_LIBWIRESHARK and _NEED_VAR_IMPORT_ */ #if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBWIRESHARKDLL) -# define ETH_VAR_IMPORT __declspec(dllimport) extern +# define WS_VAR_IMPORT __declspec(dllimport) extern #else -# define ETH_VAR_IMPORT extern +# define WS_VAR_IMPORT extern #endif #define HAVE_NET_SNMP 1 |