diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-07-25 23:49:47 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-07-25 23:49:47 +0000 |
| commit | a05f55bffc2bc7d52d3f35370a7ae1eea2b75839 (patch) | |
| tree | 94644ff0a3cc6cf339a165087ddbfb0c1e553760 /epan/uat.h | |
| parent | 7d73903af6209ef1b013c6ed61c866291bfb3785 (diff) | |
| download | wireshark-a05f55bffc2bc7d52d3f35370a7ae1eea2b75839.tar.gz | |
Add a UAT dialog. Make UAT preferences uat_t * instead of void *.
C++-ize the UAT headers.
Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT
dialogs.
Update the Qt README.
svn path=/trunk/; revision=50896
Diffstat (limited to 'epan/uat.h')
| -rw-r--r-- | epan/uat.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/epan/uat.h b/epan/uat.h index bd30ad1641..1c2221005c 100644 --- a/epan/uat.h +++ b/epan/uat.h @@ -27,11 +27,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _UAT_H_ -#define _UAT_H_ +#ifndef __UAT_H__ +#define __UAT_H__ #include "ws_symbol_export.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* * uat mantains a dynamically allocated table accessible to the user * via a file and/or gui tables. @@ -571,4 +575,8 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out {#field_name, title, PT_TXTMOD_STRING,{uat_fld_chk_range,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},\ {0,0,0},GUINT_TO_POINTER(max),desc,FLDFILL} -#endif +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __UAT_H__ */ |