diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-01-18 18:43:30 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-01-18 18:43:30 +0000 |
| commit | 0fb0fa8794861d6bb6beaa286252a5f834003182 (patch) | |
| tree | 31dcc82b880094f7adc83befdcb58da4645cb757 /epan/column_info.h | |
| parent | cba9c4efa80764010810c602965ba768fb7d3206 (diff) | |
Put
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
...
#ifdef __cplusplus
}
#endif /* __cplusplus */
wrappers into some header files, for the benefit of C++ plugins. Also,
add multiple-include protections.
svn path=/trunk/; revision=20485
Diffstat (limited to 'epan/column_info.h')
| -rw-r--r-- | epan/column_info.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/epan/column_info.h b/epan/column_info.h index 44683d6dc7..ad91439d4d 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -27,6 +27,10 @@ #include <glib.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define COL_MAX_LEN 256 #define COL_MAX_INFO_LEN 4096 @@ -102,13 +106,14 @@ enum { COL_8021Q_VLAN_ID, /* 802.1Q vlan ID */ COL_DSCP_VALUE, /* IP DSCP Value */ COL_COS_VALUE, /* L2 COS Value */ - COL_TEI, /* q.921 TEI */ - COL_FR_DLCI, /* Frame Relay DLCI */ - COL_BSSGP_TLLI, /* GPRS BSSGP IE TLLI */ + COL_TEI, /* Q.921 TEI */ + COL_FR_DLCI, /* Frame Relay DLCI */ + COL_BSSGP_TLLI, /* GPRS BSSGP IE TLLI */ NUM_COL_FMTS /* Should always be last */ }; -#endif /* __COLUMN_INFO_H__ */ - - +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif /* __COLUMN_INFO_H__ */ |