@@ -54,6 +54,18 @@
#include <sys/socket.h>
#include <stdint.h>
+#ifndef __struct_osockaddr_defined
+/* This is the 4.3 BSD `struct sockaddr' format, which is used as wire
+ format in the grotty old 4.3 `talk' protocol. It's also defined in
+ sys/socket.h, but only under __USE_MISC. */
+struct osockaddr
+ {
+ unsigned short int sa_family;
+ unsigned char sa_data[14];
+ };
+# define __struct_osockaddr_defined
+#endif
+
/*
* Client->server request message format.
*/
@@ -38,13 +38,17 @@ __BEGIN_DECLS
#include <bits/socket.h>
#ifdef __USE_MISC
+# ifndef __struct_osockaddr_defined
/* This is the 4.3 BSD `struct sockaddr' format, which is used as wire
- format in the grotty old 4.3 `talk' protocol. */
+ format in the grotty old 4.3 `talk' protocol. It is also defined,
+ unconditionally, in protocols/talkd.h. */
struct osockaddr
{
unsigned short int sa_family;
unsigned char sa_data[14];
};
+# define __struct_osockaddr_defined
+# endif
#endif
/* The following constants should be used for the second parameter of