summaryrefslogtreecommitdiff
blob: 80a7bfda84a90396da9940343684cd1054072502 (plain)
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
Fixes from upstream CVS for gcc-4.x.

http://bugs.gentoo.org/show_bug.cgi?id=86128

--- xinetd/service.c
+++ xinetd/service.c
@@ -764,8 +764,8 @@
                return FAILED;
 
             if ( last == NULL ) {
-               last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ) = 
-		  SAIN( calloc( 1, sizeof(union xsockaddr) ) );
+               last = SAIN( calloc( 1, sizeof(union xsockaddr) ) );
+               SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last;
             }
 
             (void) time( &current_time ) ;
@@ -791,8 +791,8 @@
                return FAILED;
 
 	    if( last == NULL ) {
-               last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)) = 
-		  SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
+	       last = SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
+	       SVC_LAST_DGRAM_ADDR( sp ) = (union xsockaddr *)last;
             }
 
             (void) time( &current_time ) ;