summaryrefslogtreecommitdiff
path: root/fmtutils.h
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2021-03-17 02:23:37 -0700
committerGuy Harris <gharris@sonic.net>2021-03-17 02:23:37 -0700
commit8b6b13d4cbb685db047af04c49817ed81fff7c35 (patch)
tree7ba565e6cfa2a8e0f25952bc720c389512255170 /fmtutils.h
parentbb02779a37fdf815da58e8828eb4ce99a4f86580 (diff)
downloadlibpcap-8b6b13d4cbb685db047af04c49817ed81fff7c35.tar.gz
Don't wrap chunks of headers with extern "C" { ... }.
Instead, explictly flag individual functions with extern "C" by adding it to the tag we're already using for exported functions, and creating a new tag to use for non-exported functions. Rename those tags, and the tags used for exported data, to say what they do, rather than saying "this is an API" (we may export things we don't want to be treated as part of the API, but that we have to export because some programs use them).
Diffstat (limited to 'fmtutils.h')
-rw-r--r--fmtutils.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/fmtutils.h b/fmtutils.h
index ba0f66ca..ecbe6610 100644
--- a/fmtutils.h
+++ b/fmtutils.h
@@ -36,22 +36,14 @@
#include "pcap/funcattrs.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void pcap_fmt_set_encoding(unsigned int);
+PCAP_UNEXPORTED_C_FUNC void pcap_fmt_set_encoding(unsigned int);
-void pcap_fmt_errmsg_for_errno(char *, size_t, int,
+PCAP_UNEXPORTED_C_FUNC void pcap_fmt_errmsg_for_errno(char *, size_t, int,
PCAP_FORMAT_STRING(const char *), ...) PCAP_PRINTFLIKE(4, 5);
#ifdef _WIN32
-void pcap_fmt_errmsg_for_win32_err(char *, size_t, DWORD,
+PCAP_UNEXPORTED_C_FUNC void pcap_fmt_errmsg_for_win32_err(char *, size_t, DWORD,
PCAP_FORMAT_STRING(const char *), ...) PCAP_PRINTFLIKE(4, 5);
#endif
-#ifdef __cplusplus
-}
-#endif
-
#endif