libCom: Remove extern "C" { #include <...> } from osdSock.h

Our joint conclusion was that wrapping system includes with
extern "C" used to be necessary on some OS builds when C++
was much less common, but is now wrong.

src/libCom/osi/os/Darwin/osdSock.h

@@ -1,7 +1,6 @@
 /*************************************************************************\
 * Copyright (c) 2002 The University of Saskatchewan
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
@@ -13,10 +12,6 @@
 #ifndef osdSockH
 #define osdSockH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <errno.h>
 
 #include <sys/types.h>
@@ -24,8 +19,6 @@ extern "C" {
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-/*#include <sys/filio.h>
-#include <sys/sockio.h>*/
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
@@ -34,10 +27,6 @@ extern "C" {
 #include <unistd.h> /* close() and others */
 
 
-#ifdef __cplusplus
-}
-#endif
- 
 typedef int                     SOCKET;
 #define INVALID_SOCKET          (-1)
 #define SOCKERRNO               errno

src/libCom/osi/os/Linux/osdSock.h

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
@@ -26,10 +25,6 @@
 #ifndef osdSockH
 #define osdSockH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <errno.h>
 
 #include <sys/types.h>
@@ -37,8 +32,6 @@ extern "C" {
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-/*#include <sys/filio.h>
-#include <sys/sockio.h>*/
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
@@ -47,10 +40,6 @@ extern "C" {
 #include <unistd.h> /* close() and others */
 
 
-#ifdef __cplusplus
-}
-#endif
- 
 typedef int                     SOCKET;
 #define INVALID_SOCKET          (-1)
 #define SOCKERRNO               errno

src/libCom/osi/os/RTEMS/osdSock.h

@@ -1,7 +1,6 @@
 /*************************************************************************\
 * Copyright (c) 2002 The University of Saskatchewan
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
@@ -14,10 +13,6 @@
 #ifndef osdSockH
 #define osdSockH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <errno.h>
 
 #include <sys/types.h>
@@ -32,6 +27,10 @@ extern "C" {
 #include <netdb.h>
 #include <unistd.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int select(int  n,  fd_set  *readfds,  fd_set  *writefds, fd_set *exceptfds, struct timeval *timeout);
 
 #ifdef __cplusplus

src/libCom/osi/os/WIN32/osdSock.h

@@ -3,15 +3,12 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef osdSockH
+#define osdSockH
 
 #include <time.h>
 #include <errno.h>
@@ -25,9 +22,6 @@ extern "C" {
 #endif
 #include <winsock2.h>
 
-#ifdef __cplusplus
-}
-#endif
 
 #define SOCKERRNO WSAGetLastError()
 
@@ -79,3 +73,4 @@ typedef int osiSocklen_t;
 
 epicsShareFunc unsigned epicsShareAPI wsaMajorVersion ();
 
+#endif /*osdSockH*/

src/libCom/osi/os/cygwin32/osdSock.h

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
@@ -15,10 +14,6 @@
 #ifndef osdSockH
 #define osdSockH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <errno.h>
 
 #include <sys/types.h>
@@ -31,10 +26,7 @@ extern "C" {
 #include <netdb.h>
 #include <unistd.h> /* close() and others */
 
-#ifdef __cplusplus
-}
-#endif
- 
+
 typedef int                     SOCKET;
 #define INVALID_SOCKET          (-1)
 #define SOCKERRNO               errno

src/libCom/osi/os/freebsd/osdSock.h

@@ -10,10 +10,6 @@
 #ifndef osdSockH
 #define osdSockH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <errno.h>
 
 #include <sys/types.h>
@@ -29,10 +25,6 @@ extern "C" {
 #include <unistd.h> /* close() and others */
 
 
-#ifdef __cplusplus
-}
-#endif
-
 #ifndef IPPORT_USERRESERVED
 #define IPPORT_USERRESERVED 5000
 #endif

src/libCom/osi/os/iOS/osdSock.h

@@ -13,10 +13,6 @@
 #ifndef osdSockH
 #define osdSockH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <errno.h>
 
 #include <sys/types.h>
@@ -24,8 +20,6 @@ extern "C" {
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-/*#include <sys/filio.h>
-#include <sys/sockio.h>*/
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
@@ -34,10 +28,6 @@ extern "C" {
 #include <unistd.h> /* close() and others */
 
 
-#ifdef __cplusplus
-}
-#endif
- 
 typedef int                     SOCKET;
 #define INVALID_SOCKET          (-1)
 #define SOCKERRNO               errno

src/libCom/osi/os/solaris/osdSock.h

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
@@ -15,10 +14,6 @@
 #ifndef osdSockH
 #define osdSockH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <errno.h>
 
 #include <sys/types.h>
@@ -35,10 +30,7 @@ extern "C" {
 #include <netdb.h>
 #include <unistd.h> /* close() and others */
 
-#ifdef __cplusplus
-}
-#endif
- 
+
 typedef int SOCKET;
 #define INVALID_SOCKET (-1)
 #define SOCKERRNO errno

src/libCom/osi/os/vxWorks/osdSock.h

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
@@ -14,12 +13,10 @@
 #ifndef osdSockH
 #define osdSockH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* This is needed for vxWorks 6.8 to prevent an obnoxious compiler warning */
+#ifndef _VSB_CONFIG_FILE
 #define _VSB_CONFIG_FILE <../lib/h/config/vsbConfig.h>
+#endif
 
 #include <errno.h>
 
@@ -36,6 +33,11 @@ extern "C" {
 #include <ioLib.h>
 #include <hostLib.h>
 #include <selectLib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*This following is not defined in any vxWorks header files*/
 int sysClkRateGet(void);