diff options
| -rw-r--r-- | src/include/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/port-sockets.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 88178298ae..7f05b0638a 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +2004-07-16 Ken Raeburn <raeburn@mit.edu> + + * port-sockets.h (inet_ntop): Cast NULL to desired return pointer + type. + 2004-07-15 Alexandra Ellwood <lxs@mit.edu> * k5-int.h (krb5_os_context) diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h index eb87bc1c90..09e3cfb418 100644 --- a/src/include/port-sockets.h +++ b/src/include/port-sockets.h @@ -157,14 +157,14 @@ typedef struct iovec sg_buf; #define inet_ntop(AF,SRC,DST,CNT) \ ((AF) == AF_INET \ ? ((CNT) < 16 \ - ? (SOCKET_SET_ERRNO(ENOSPC), NULL) \ + ? (SOCKET_SET_ERRNO(ENOSPC), (const char *)NULL) \ : (sprintf((DST), "%d.%d.%d.%d", \ ((const unsigned char *)(const void *)(SRC))[0] & 0xff, \ ((const unsigned char *)(const void *)(SRC))[1] & 0xff, \ ((const unsigned char *)(const void *)(SRC))[2] & 0xff, \ ((const unsigned char *)(const void *)(SRC))[3] & 0xff), \ (DST))) \ - : (SOCKET_SET_ERRNO(EAFNOSUPPORT), NULL)) + : (SOCKET_SET_ERRNO(EAFNOSUPPORT), (const char *)NULL)) #define HAVE_INET_NTOP #endif |