From 027212247d59c05452abb7a8b253efe52d14459e Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Fri, 28 Apr 2000 22:09:15 +0000
Subject: [PATCH]  136.   [cleanup]       <isc/commandline.h>,
 <isc/interfaceiter.h>,                         <isc/net.h> and Win32's
 <isc/thread.h> needed                        
 ISC_LANG_BEGINDECLS/ISC_LANG_ENDDECLS.

---
 CHANGES                             |  4 ++++
 lib/isc/include/isc/commandline.h   |  7 ++++++-
 lib/isc/include/isc/interfaceiter.h |  7 ++++++-
 lib/isc/unix/include/isc/net.h      | 11 ++++-------
 lib/isc/win32/include/isc/net.h     |  5 +++++
 lib/isc/win32/include/isc/thread.h  | 17 ++++++++++++-----
 6 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index f3b3818b63..510622c9cd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+ 136.   [cleanup]       <isc/commandline.h>, <isc/interfaceiter.h>,
+                        <isc/net.h> and Win32's <isc/thread.h> needed
+                        ISC_LANG_BEGINDECLS/ISC_LANG_ENDDECLS.
+
  135.   [cleanup]       Win32's <isc/condition.h> did not need
                         <isc/boolean.h>, now uses <isc/types.h> in place
                         of <isc/time.h>, and needed ISC_LANG_BEGINDECLS
diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h
index 9379ca7bd3..5127654e81 100644
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -15,9 +15,10 @@
  * SOFTWARE.
  */
 
-/* $Id: commandline.h,v 1.2 2000/02/03 23:07:48 halley Exp $ */
+/* $Id: commandline.h,v 1.3 2000/04/28 22:09:15 tale Exp $ */
 
 #include <isc/boolean.h>
+#include <isc/lang.h>
 
 extern int isc_commandline_index;	/* Index into parent argv vector. */
 extern int isc_commandline_option;	/* Character checked for validity. */
@@ -28,5 +29,9 @@ extern char *isc_commandline_progname;	/* For printing error messages. */
 extern isc_boolean_t isc_commandline_errprint;	/* Print error message. */
 extern isc_boolean_t isc_commandline_reset;    	/* Reset getopt. */
 
+ISC_LANG_BEGINDECLS
+
 int
 isc_commandline_parse(int argc, char * const *argv, const char *options);
+
+ISC_LANG_ENDDECLS
diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h
index b334e35f90..2e41ef0921 100644
--- a/lib/isc/include/isc/interfaceiter.h
+++ b/lib/isc/include/isc/interfaceiter.h
@@ -40,8 +40,9 @@
  *** Imports
  ***/
 
-#include <isc/types.h>
+#include <isc/lang.h>
 #include <isc/netaddr.h>
+#include <isc/types.h>
 
 /*
  * Public structure describing a network interface.
@@ -67,6 +68,8 @@ struct isc_interface {
  *** Functions
  ***/
 
+ISC_LANG_BEGINDECLS
+
 isc_result_t
 isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp);
 /*
@@ -124,4 +127,6 @@ isc_interfaceiter_destroy(isc_interfaceiter_t **iterp);
  * Destroy the iterator.
  */
 
+ISC_LANG_ENDDECLS
+
 #endif /* ISC_INTERFACEITER_H */
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 7aceabad09..038089eb5c 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -64,6 +64,7 @@
 /***
  *** Imports.
  ***/
+#include <isc/lang.h>
 #include <isc/platform.h>
 
 #include <sys/types.h>
@@ -119,6 +120,8 @@ typedef isc_uint16_t in_port_t;
  *** Functions.
  ***/
 
+ISC_LANG_BEGINDECLS
+
 isc_result_t
 isc_net_probeipv4(void);
 /*
@@ -158,12 +161,6 @@ int isc_net_aton(const char *cp, struct in_addr *addr);
 #define inet_aton isc_net_aton
 #endif
 
-/*
- * Tell emacs to use C mode for this file.
- *
- * Local Variables:
- * mode: c
- * End:
- */
+ISC_LANG_ENDDECLS
 
 #endif /* ISC_NET_H */
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index 2304d12e91..136ae4be89 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -108,6 +108,7 @@
 
 #include <sys/types.h>
 
+#include <isc/lang.h>
 #include <isc/result.h>
 
 #ifndef AF_INET6
@@ -135,6 +136,8 @@ typedef isc_uint16_t in_port_t;
  *** Functions.
  ***/
 
+ISC_LANG_BEGINDECLS
+
 isc_result_t
 isc_net_probeipv4(void);
 /*
@@ -174,4 +177,6 @@ int isc_net_aton(const char *cp, struct in_addr *addr);
 #define inet_aton isc_net_aton
 #endif
 
+ISC_LANG_ENDDECLS
+
 #endif /* ISC_NET_H */
diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index 034717325e..58e743f32a 100644
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -20,6 +20,7 @@
 
 #include <windows.h>
 
+#include <isc/lang.h>
 #include <isc/result.h>
 
 typedef HANDLE isc_thread_t;
@@ -27,10 +28,16 @@ typedef unsigned int isc_threadresult_t;
 typedef void * isc_threadarg_t;
 typedef isc_threadresult_t (WINAPI *isc_threadfunc_t)(isc_threadarg_t);
 
-isc_result_t isc_thread_create(isc_threadfunc_t, isc_threadarg_t, 
-			       isc_thread_t *);
-isc_result_t isc_thread_join(isc_thread_t, isc_threadresult_t *);
-#define isc_thread_self \
-	(unsigned long)GetCurrentThreadId
+#define isc_thread_self (unsigned long)GetCurrentThreadId
+
+ISC_LANG_BEGINDECLS
+
+isc_result_t
+isc_thread_create(isc_threadfunc_t, isc_threadarg_t, isc_thread_t *);
+
+isc_result_t
+isc_thread_join(isc_thread_t, isc_threadresult_t *);
+
+ISC_LANG_ENDDECLS
 
 #endif /* ISC_THREAD_H */