diff options
| author | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
| commit | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch) | |
| tree | c59b4dbcc610f10700945f885adf3bddc2542c26 /openbsd-compat/openbsd-compat.h | |
| parent | 8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff) | |
| parent | b9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff) | |
merge 6.0p1
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
| -rw-r--r-- | openbsd-compat/openbsd-compat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 77c5ed2b1..807acf626 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: openbsd-compat.h,v 1.51 2010/10/07 10:25:29 djm Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.52 2011/09/23 01:16:11 djm Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
| @@ -116,7 +116,7 @@ char *inet_ntoa(struct in_addr in); | |||
| 116 | #endif | 116 | #endif |
| 117 | 117 | ||
| 118 | #ifndef HAVE_INET_NTOP | 118 | #ifndef HAVE_INET_NTOP |
| 119 | const char *inet_ntop(int af, const void *src, char *dst, size_t size); | 119 | const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); |
| 120 | #endif | 120 | #endif |
| 121 | 121 | ||
| 122 | #ifndef HAVE_INET_ATON | 122 | #ifndef HAVE_INET_ATON |