Made netinet/in.h compatible with modern C++ compilers - change merged in from...

Made netinet/in.h compatible with modern C++ compilers - change merged in from current NetBSD source code.

Version 5.46. Tagged as 'TCPIPLibs-5_46'

VersionNum

-/* (5.45)
+/* (5.46)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.68.
+ * Last processed by srccommit version: 1.2.
  *
  */
-#define Module_MajorVersion_CMHG        5.45
+#define Module_MajorVersion_CMHG        5.46
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                07 Jan 2003
+#define Module_Date_CMHG                02 Dec 2003
 
-#define Module_MajorVersion             "5.45"
-#define Module_Version                  545
+#define Module_MajorVersion             "5.46"
+#define Module_Version                  546
 #define Module_MinorVersion             ""
-#define Module_Date                     "07 Jan 2003"
+#define Module_Date                     "02 Dec 2003"
 
-#define Module_ApplicationDate          "07-Jan-03"
+#define Module_ApplicationDate          "02-Dec-03"
 
 #define Module_ComponentName            "TCPIPLibs"
 #define Module_ComponentPath            "RiscOS/Sources/Lib/TCPIPLibs"
 
-#define Module_FullVersion              "5.45"
-#define Module_HelpVersion              "5.45 (07 Jan 2003)"
-#define Module_LibraryVersionInfo       "5:45"
+#define Module_FullVersion              "5.46"
+#define Module_HelpVersion              "5.46 (02 Dec 2003)"
+#define Module_LibraryVersionInfo       "5:46"

headers/netinet/h/in

@@ -299,7 +299,11 @@ struct sockaddr_in {
  */
 struct ip_opts {
 	struct	in_addr ip_dst;		/* first hop, 0 w/o src rt */
+#ifdef __cplusplus
+	char	Ip_opts[40];		/* actually variable in size */
+#else
 	char	ip_opts[40];		/* actually variable in size */
+#endif
 };
 
 /*