| author | Radhika Siravara<radhika.siravara@oracle.com> |
| Tue, 17 Nov 2015 09:12:59 -0800 | |
| changeset 5098 | 77b8086c6247 |
| parent 4957 | 69c89839e1ee |
| permissions | -rw-r--r-- |
|
4957
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch was developed in-house and is planned to be contributed upstream |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
(it is still needed for version 2.6.1). |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
--- git-1.7.9.2/git-compat-util.h.~1~ 2015-09-24 16:14:32.844686777 -0700 |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ git-1.7.9.2/git-compat-util.h 2015-09-24 16:13:05.181990467 -0700 |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -418,7 +418,7 @@ |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
#endif |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
|
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
#ifdef NO_INET_NTOP |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
-const char *inet_ntop(int af, const void *src, char *dst, size_t size); |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
#endif |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
|
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
extern void release_pack_memory(size_t, int); |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
--- git-1.7.9.2/compat/inet_ntop.c.~1~ 2015-09-24 16:16:58.256287899 -0700 |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
+++ git-1.7.9.2/compat/inet_ntop.c 2015-09-24 16:17:19.386385899 -0700 |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
@@ -168,7 +168,7 @@ |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
* Paul Vixie, 1996. |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
*/ |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
const char * |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
-inet_ntop(int af, const void *src, char *dst, size_t size) |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
+inet_ntop(int af, const void *src, char *dst, socklen_t size) |
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
{
|
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
switch (af) {
|
|
69c89839e1ee
21955798 new git patch to prevent inet_ntop() compile failures
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
25 |
case AF_INET: |