osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add extern C if cplusplus (when use with Qt) Add Modelines (and fix indent use 4 spaces for oids.h) 

svn path=/trunk/; revision=53387
This commit is contained in:
Alexis La Goutte 2013-11-17 14:03:17 +00:00
parent 768d2777a3
commit 983ea7664c
2 changed files with 94 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
epan/geoip_db.h
View File

@ -27,6 +27,10 @@
#ifndef __GEOIP_DB_H__
#define __GEOIP_DB_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include <epan/ipv6-utils.h>
#include <epan/prefs.h>
#include "ws_symbol_export.h"
@ -92,4 +96,21 @@ WS_DLL_PUBLIC const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr ad
*/
WS_DLL_PUBLIC gchar *geoip_db_get_paths(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GEOIP_DB_H__ */
/*
* Editor modelines
*
* Local Variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/

23
epan/oids.h
View File

@ -27,6 +27,10 @@
#ifndef __OIDS_H__
#define __OIDS_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include <epan/ftypes/ftypes.h>
#include <epan/prefs.h>
#include <epan/wmem/wmem.h>
@ -197,4 +201,21 @@ extern void add_oid_debug_subtree(oid_info_t* oid_info, proto_tree *tree);
#define add_oid_debug_subtree(a,b) ((void)0)
#endif
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __OIDS_H__ */
/*
* Editor modelines
*
* Local Variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/