Package: virtuoso-opensource / 6.1.6+dfsg2-4

remove-saddr_t-typedef.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
Description: Remove the saddr_t typedef
 This clashes with system headers on s390x.
Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Debian: https://bugs.debian.org/805157
Forwarded: no
Last-Update: 2015-12-24

Index: b/libsrc/Dk/Dksestcp.c
===================================================================
--- a/libsrc/Dk/Dksestcp.c
+++ b/libsrc/Dk/Dksestcp.c
@@ -587,7 +587,7 @@
 {
   int rc;
   int new_socket;
-  socklen_t addrlen = sizeof (saddr_t);
+  socklen_t addrlen = sizeof (struct sockaddr);
 
   dbg_printf_1 (("tcpses_accept."));
 
@@ -2481,7 +2481,7 @@
       return (SER_CNTRL);
     }
 
-  if ((rc = bind (s, (saddr_t *) p_addr, sizeof (saddrun_t))) < 0)
+  if ((rc = bind (s, (struct sockaddr *) p_addr, sizeof (saddrun_t))) < 0)
     {
 
       test_eintr (ses, rc, errno);
Index: b/libsrc/Dk/Dksestcpint.h
===================================================================
--- a/libsrc/Dk/Dksestcpint.h
+++ b/libsrc/Dk/Dksestcpint.h
@@ -42,7 +42,6 @@
 
 
 typedef struct sockaddr_in saddrin_t;
-typedef struct sockaddr saddr_t;
 #ifdef COM_UNIXSOCK
 typedef struct sockaddr_un saddrun_t;
 #endif
@@ -53,7 +52,7 @@
 #ifdef COM_UNIXSOCK
   saddrun_t 	u;
 #endif
-  saddr_t 	a;
+  struct sockaddr 	a;
 } usaddr_t;
 #define TCP_HOSTNAMELEN     100				   /* Something */