remove macros which defined extern "C" for C++

ok florian@

5 files changed, 4 insertions, 33 deletions

diff --git a/usr.bin/dig/lib/isc/unix/errno2result.h b/usr.bin/dig/lib/isc/unix/errno2result.h
index 11d326ca184..c650e3db7be 100644
--- a/usr.bin/dig/lib/isc/unix/errno2result.h
+++ b/usr.bin/dig/lib/isc/unix/errno2result.h
@@ -21,17 +21,12 @@
 
 /* XXXDCL this should be moved to lib/isc/include/isc/errno2result.h. */
 
-#include <isc/lang.h>
 #include <isc/types.h>
 
-ISC_LANG_BEGINDECLS
-
 #define isc__errno2result(x) isc___errno2result(x, ISC_TRUE, __FILE__, __LINE__)
 
 isc_result_t
 isc___errno2result(int posixerrno, isc_boolean_t dolog,
 		   const char *file, unsigned int line);
 
-ISC_LANG_ENDDECLS
-
 #endif /* UNIX_ERRNO2RESULT_H */
diff --git a/usr.bin/dig/lib/isc/unix/include/isc/net.h b/usr.bin/dig/lib/isc/unix/include/isc/net.h
index eaa3afd6715..3bf8aea2e98 100644
--- a/usr.bin/dig/lib/isc/unix/include/isc/net.h
+++ b/usr.bin/dig/lib/isc/unix/include/isc/net.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.4 2020/02/13 12:03:51 jsg Exp $ */
+/* $Id: net.h,v 1.5 2020/02/13 13:53:01 jsg Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
@@ -72,14 +72,11 @@
  *** Imports.
  ***/
 
-
 #include <sys/socket.h>		/* Contractual promise. */
 
 #include <netinet/in.h>		/* Contractual promise. */
 #include <arpa/inet.h>		/* Contractual promise. */
 
-#include <isc/lang.h>
-
 /*% IP address. */
 #define ISC__IPADDR(x)	((uint32_t)htonl((uint32_t)(x)))
 
@@ -96,8 +93,6 @@
  *** Functions.
  ***/
 
-ISC_LANG_BEGINDECLS
-
 void
 isc_net_disableipv4(void);
 
@@ -118,6 +113,4 @@ isc_net_probedscp(void);
  * Probe the level of DSCP support.
  */
 
-ISC_LANG_ENDDECLS
-
 #endif /* ISC_NET_H */
diff --git a/usr.bin/dig/lib/isc/unix/include/isc/stdtime.h b/usr.bin/dig/lib/isc/unix/include/isc/stdtime.h
index 15c2107c7dc..54dccb42b89 100644
--- a/usr.bin/dig/lib/isc/unix/include/isc/stdtime.h
+++ b/usr.bin/dig/lib/isc/unix/include/isc/stdtime.h
@@ -14,16 +14,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.h,v 1.1 2020/02/07 09:58:54 florian Exp $ */
+/* $Id: stdtime.h,v 1.2 2020/02/13 13:53:01 jsg Exp $ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1
 
 /*! \file */
 
-#include <isc/lang.h>
-
-
 /*%
  * It's public information that 'isc_stdtime_t' is an unsigned integral type.
  * Applications that want maximum portability should not assume anything
@@ -41,7 +38,6 @@ typedef uint32_t isc_stdtime_t;
  */
 typedef uint32_t isc_stdtime32_t;
 
-ISC_LANG_BEGINDECLS
 /* */
 void
 isc_stdtime_get(isc_stdtime_t *t);
@@ -58,6 +54,4 @@ isc_stdtime_get(isc_stdtime_t *t);
  * Convert the standard time to its 32-bit version.
  */
 
-ISC_LANG_ENDDECLS
-
 #endif /* ISC_STDTIME_H */
diff --git a/usr.bin/dig/lib/isc/unix/include/isc/strerror.h b/usr.bin/dig/lib/isc/unix/include/isc/strerror.h
index 4d7f7184f43..6af33b6628f 100644
--- a/usr.bin/dig/lib/isc/unix/include/isc/strerror.h
+++ b/usr.bin/dig/lib/isc/unix/include/isc/strerror.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: strerror.h,v 1.1 2020/02/07 09:58:54 florian Exp $ */
+/* $Id: strerror.h,v 1.2 2020/02/13 13:53:01 jsg Exp $ */
 
 #ifndef ISC_STRERROR_H
 #define ISC_STRERROR_H
@@ -23,10 +23,6 @@
 
 #include <sys/types.h>
 
-#include <isc/lang.h>
-
-ISC_LANG_BEGINDECLS
-
 /*% String Error Size */
 #define ISC_STRERRORSIZE 128
 
@@ -39,6 +35,4 @@ ISC_LANG_BEGINDECLS
 void
 isc__strerror(int num, char *buf, size_t bufsize);
 
-ISC_LANG_ENDDECLS
-
 #endif /* ISC_STRERROR_H */
diff --git a/usr.bin/dig/lib/isc/unix/include/isc/time.h b/usr.bin/dig/lib/isc/unix/include/isc/time.h
index 0c76045a417..288b3d058f9 100644
--- a/usr.bin/dig/lib/isc/unix/include/isc/time.h
+++ b/usr.bin/dig/lib/isc/unix/include/isc/time.h
@@ -14,14 +14,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.2 2020/02/12 13:05:04 jsg Exp $ */
+/* $Id: time.h,v 1.3 2020/02/13 13:53:01 jsg Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
 
 /*! \file */
 
-#include <isc/lang.h>
 #include <isc/types.h>
 
 /***
@@ -49,8 +48,6 @@ extern const interval_t * const interval_zero;
  */
 #define ISC_FORMATHTTPTIMESTAMP_SIZE 50
 
-ISC_LANG_BEGINDECLS
-
 void
 interval_set(interval_t *i,
 		 unsigned int seconds, unsigned int nanoseconds);
@@ -271,6 +268,4 @@ isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len);
  *
  */
 
-ISC_LANG_ENDDECLS
-
 #endif /* ISC_TIME_H */