diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-01-04 21:26:51 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-01-04 21:26:51 +0000 |
| commit | 9dc580af2a19ac5a80b8ee610bdf6ae328495d52 (patch) | |
| tree | 00393e3e49b36c7da2eb1a432648c82a1432d3dd | |
| parent | cd6d0b075fb1d4c86a519260fd95e88d1a01bdc0 (diff) | |
More C++ updates.
svn path=/trunk/; revision=40377
| -rw-r--r-- | epan/crypt/airpdcap_ws.h | 9 | ||||
| -rw-r--r-- | epan/dfilter/dfilter.h | 9 | ||||
| -rw-r--r-- | wsutil/wsgetopt.h | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/epan/crypt/airpdcap_ws.h b/epan/crypt/airpdcap_ws.h index fe5ab73f44..66123524a4 100644 --- a/epan/crypt/airpdcap_ws.h +++ b/epan/crypt/airpdcap_ws.h @@ -38,6 +38,15 @@ #define _AIRPDCAP_WS_H #include "airpdcap_system.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + WS_VAR_IMPORT AIRPDCAP_CONTEXT airpdcap_ctx; +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _AIRPDCAP_WS_H */ diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h index 7951569f23..4bd2aa8565 100644 --- a/epan/dfilter/dfilter.h +++ b/epan/dfilter/dfilter.h @@ -31,6 +31,9 @@ typedef struct _dfilter_t dfilter_t; #include <epan/epan.h> #include <epan/proto.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ /* Module-level initialization */ void @@ -91,4 +94,8 @@ dfilter_deprecated_tokens(dfilter_t *df); void dfilter_dump(dfilter_t *df); -#endif +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* DFILTER_H */ diff --git a/wsutil/wsgetopt.h b/wsutil/wsgetopt.h index 8744bed10f..9d4f817f3a 100644 --- a/wsutil/wsgetopt.h +++ b/wsutil/wsgetopt.h @@ -115,7 +115,7 @@ extern int _getopt_internal (int argc, char *const *argv, const struct option *longopts, int *longind, int long_only); #else /* not __STDC__ */ -extern int getopt (); +extern int getopt (int, char *const *, const char *); extern int getopt_long (); extern int getopt_long_only (); |