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 /wiretap | |
| 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 'wiretap')
| -rw-r--r-- | wiretap/catapult_dct2000.h | 1 | ||||
| -rw-r--r-- | wiretap/configure.in | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/wiretap/catapult_dct2000.h b/wiretap/catapult_dct2000.h index fb936a91f6..f57c5d2adf 100644 --- a/wiretap/catapult_dct2000.h +++ b/wiretap/catapult_dct2000.h @@ -28,3 +28,4 @@ int catapult_dct2000_dump_can_write_encap(int encap); #define DCT2000_ENCAP_SSCOP 101 #define DCT2000_ENCAP_MTP2 102 +WS_VAR_IMPORT gboolean catapult_dct2000_board_ports_only; diff --git a/wiretap/configure.in b/wiretap/configure.in index 9a7bd9c7b3..a6628aac84 100644 --- a/wiretap/configure.in +++ b/wiretap/configure.in @@ -172,6 +172,12 @@ dnl Checks for header files AC_HEADER_STDC AC_CHECK_HEADERS(sys/time.h netinet/in.h unistd.h fcntl.h sys/stat.h sys/types.h) +# +# Define WS_VAR_IMPORT appropriately for declarations of external +# variables exported from dynamically-linked libraries. +# +AC_DEFINE(WS_VAR_IMPORT, extern, [Define as the string to precede external variable declarations in dynamically-linked libraries]) + # We must know our byte order AC_C_BIGENDIAN |