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 /epan/proto.h | |
| parent | 797bb2d5d7cfcaf497585bd68afe1d37d96b9852 (diff) | |
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 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/proto.h b/epan/proto.h index 86e07eba32..43e054b700 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -52,7 +52,7 @@ #include "ftypes/ftypes.h" /** The header-field index for the special text pseudo-field. Exported by libwireshark.dll */ -ETH_VAR_IMPORT int hf_text_only; +WS_VAR_IMPORT int hf_text_only; /** the maximum length of a protocol field string representation */ #define ITEM_LABEL_LENGTH 240 @@ -1496,11 +1496,11 @@ extern void proto_registrar_dump_fields(int format); a subtree item type. That array element is TRUE if subtrees of an item of that type are to be expanded. With MSVC and a libwireshark.dll, we need a special declaration. */ -ETH_VAR_IMPORT gboolean *tree_is_expanded; +WS_VAR_IMPORT gboolean *tree_is_expanded; /** Number of elements in the tree_is_expanded array. With MSVC and a * libwireshark.dll, we need a special declaration. */ -ETH_VAR_IMPORT int num_tree_types; +WS_VAR_IMPORT int num_tree_types; /** glib doesn't have g_ptr_array_len of all things!*/ #ifndef g_ptr_array_len |