Revert "Don't wrap chunks of headers with extern "C" { ... }."

This reverts commit 8b6b13d4cbb685db047af04c49817ed81fff7c35.

That solution allowed you to intermix declarations/definitions and
before the extern "C", so you can see what's being imported.

1 files changed, 4 insertions, 4 deletions

diff --git a/pcap.c b/pcap.c
index aabd51f6..b8b8af2a 100644
--- a/pcap.c
+++ b/pcap.c
@@ -318,15 +318,15 @@ pcap_init(unsigned int opts, char *errbuf)
 /*
  * String containing the library version.
  * Not explicitly exported via a header file - the right API to use
- * is pcap_lib_version() - but some programs referred to it, so we
+ * is pcap_lib_version() - but some programs included it, so we
  * provide it.
  *
  * We declare it here, right before defining it, to squelch any
  * warnings we might get from compilers about the lack of a
  * declaration.
  */
-PCAP_EXPORTED_DATA char pcap_version[];
-PCAP_EXPORTED_DATA_DEF char pcap_version[] = PACKAGE_VERSION;
+PCAP_API char pcap_version[];
+PCAP_API_DEF char pcap_version[] = PACKAGE_VERSION;
 
 static void
 pcap_set_not_initialized_message(pcap_t *pcap)
@@ -4425,7 +4425,7 @@ pcap_open_dead(int linktype, int snaplen)
  * it's not declared in any header file, and won't be declared in any
  * header file provided by libpcap.
  */
-PCAP_EXPORTED_C_FUNC void pcap_set_parser_debug(int value);
+PCAP_API void pcap_set_parser_debug(int value);
 
 PCAP_API_DEF void
 pcap_set_parser_debug(int value)