5 files changed, 39 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index bbd00eb79..f922e260b 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+Sun Oct  1 23:55:00 2000  Corinna Vinschen <corinna@vinschen.de>
+
+        * include/ipexport.h: Add missing `extern "C"' directives.
+        * include/iphlpapi.h: Ditto.
+        * include/iprtrmib.h: Ditto.
+        * include/iptypes.h: Ditto.
+
 Sun Oct  1 22:09:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
         * include/ipifcons.h: New header file.
diff --git a/winsup/w32api/include/ipexport.h b/winsup/w32api/include/ipexport.h
index a9b9ce012..1b11c5170 100644
--- a/winsup/w32api/include/ipexport.h
+++ b/winsup/w32api/include/ipexport.h
@@ -1,6 +1,10 @@
 #ifndef _IPEXPORT_H_
 #define _IPEXPORT_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef ANY_SIZE
 #define ANY_SIZE 1
 #endif
@@ -19,4 +23,8 @@ typedef struct {
   IP_ADAPTER_INDEX_MAP Adapter[ANY_SIZE];
 } IP_INTERFACE_INFO, *PIP_INTERFACE_INFO;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _IPEXPORT_H_ */
diff --git a/winsup/w32api/include/iphlpapi.h b/winsup/w32api/include/iphlpapi.h
index 1bc5b00f9..493224947 100644
--- a/winsup/w32api/include/iphlpapi.h
+++ b/winsup/w32api/include/iphlpapi.h
@@ -5,6 +5,10 @@
 #include <ipexport.h>
 #include <iptypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW);
 DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW);
 DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW);
@@ -37,4 +41,8 @@ DWORD WINAPI SetIpStatistics(PMIB_IPSTATS);
 DWORD WINAPI SetIpTTL(UINT);
 DWORD WINAPI SetTcpEntry(PMIB_TCPROW);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _IPHLPAPI_H_ */
diff --git a/winsup/w32api/include/iprtrmib.h b/winsup/w32api/include/iprtrmib.h
index d0d02df0c..10ea65fb3 100644
--- a/winsup/w32api/include/iprtrmib.h
+++ b/winsup/w32api/include/iprtrmib.h
@@ -3,6 +3,10 @@
 
 #include <ipifcons.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef ANY_SIZE
 #define ANY_SIZE 1
 #endif
@@ -223,4 +227,8 @@ typedef struct {
   MIB_UDPROW table[ANY_SIZE];
 } MIB_UDPTABLE, *PMIB_UDPTABLE;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _IPRTRMIB_H_ */
diff --git a/winsup/w32api/include/iptypes.h b/winsup/w32api/include/iptypes.h
index 56a467910..94fbb771d 100644
--- a/winsup/w32api/include/iptypes.h
+++ b/winsup/w32api/include/iptypes.h
@@ -1,6 +1,10 @@
 #ifndef _IPTYPES_H_
 #define _IPTYPES_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DEFAULT_MINIMUM_ENTITIES 32
 
 #define MAX_ADAPTER_ADDRESS_LENGTH 8
@@ -67,4 +71,8 @@ typedef struct {
   UINT EnableDns;
 } FIXED_INFO, *PFIXED_INFO;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _IPTYPES_H_ */