diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-07-17 00:37:28 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-07-17 00:37:28 +0000 |
| commit | c9696e20527af3646e99aac33215874696219fdc (patch) | |
| tree | 68e2b80a5357d6085005837db63175f2e978fff9 /src/include | |
| parent | 2ccf5640522eec31ce4b59f92e867c5e6a0eeb61 (diff) | |
| download | krb5-c9696e20527af3646e99aac33215874696219fdc.tar.gz krb5-c9696e20527af3646e99aac33215874696219fdc.tar.xz krb5-c9696e20527af3646e99aac33215874696219fdc.zip | |
zap remaining bits of macsock.h support
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16612 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 2 | ||||
| -rw-r--r-- | src/include/configure.in | 6 | ||||
| -rw-r--r-- | src/include/krb5/.Sanitize | 1 | ||||
| -rw-r--r-- | src/include/port-sockets.h | 8 |
4 files changed, 4 insertions, 13 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 30cccd96c4..47a08800d4 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,5 +1,7 @@ 2004-07-16 Ken Raeburn <raeburn@mit.edu> + * configure.in, port-sockets.h: Don't check for macsock.h. + * fake-addrinfo.h: Don't include netdb.h, since port-sockets.h already does. * port-sockets.h: Define _XOPEN_SOURCE_EXTENDED around inclusion diff --git a/src/include/configure.in b/src/include/configure.in index 98693c837e..381836ccbb 100644 --- a/src/include/configure.in +++ b/src/include/configure.in @@ -119,7 +119,7 @@ AC_CHECK_HEADER(termios.h,dnl AC_DEFINE(POSIX_TERMIOS,1,[Define if termios.h exists and tcsetattr exists]))]) dnl KRB5_SIGTYPE -AC_CHECK_HEADERS(stdlib.h string.h stddef.h unistd.h sys/types.h sys/file.h sys/param.h sys/stat.h sys/time.h netinet/in.h macsock.h xom.h sys/uio.h sys/filio.h sys/select.h time.h paths.h) +AC_CHECK_HEADERS(stdlib.h string.h stddef.h unistd.h sys/types.h sys/file.h sys/param.h sys/stat.h sys/time.h netinet/in.h xom.h sys/uio.h sys/filio.h sys/select.h time.h paths.h) AC_HEADER_STDARG KRB5_AC_INET6 dnl @@ -132,11 +132,7 @@ AC_CACHE_CHECK([for in6addr_any definition in library], #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef HAVE_MACSOCK_H -#include <macsock.h> -#else #include <sys/socket.h> -#endif #include <netinet/in.h> #include <netdb.h> ],[ diff --git a/src/include/krb5/.Sanitize b/src/include/krb5/.Sanitize index a708288e21..2dcb284b33 100644 --- a/src/include/krb5/.Sanitize +++ b/src/include/krb5/.Sanitize @@ -40,7 +40,6 @@ copyright.h kdb.h kdb_dbc.h kdb_dbm.h -macsock.h stock winsock.h diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h index 6e8ca47bf4..700db75108 100644 --- a/src/include/port-sockets.h +++ b/src/include/port-sockets.h @@ -70,17 +70,13 @@ typedef WSABUF sg_buf; /* If this source file requires it, define struct sockaddr_in (and possibly other things related to network I/O). */ -#ifdef HAVE_MACSOCK_H /* Sockets stuff differs on Mac */ -#include "macsock.h" /* Macintosh sockets emulation library */ -#else /* ! HAVE_MACSOCK_H */ /* Sockets stuff for Unix machines */ - #include "krb5/autoconf.h" #include <sys/types.h> #include <netinet/in.h> /* For struct sockaddr_in and in_addr */ #include <arpa/inet.h> /* For inet_ntoa */ -#if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(HAVE_MACSOCK_H) && !defined(_WIN32) +#if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(_WIN32) /* Hack for HPUX, to get h_errno. */ # define _XOPEN_SOURCE_EXTENDED 1 # include <netdb.h> @@ -177,8 +173,6 @@ typedef struct iovec sg_buf; #define HAVE_INET_NTOP #endif -#endif /* HAVE_MACSOCK_H */ - #endif /* _WIN32 */ #if !defined(_WIN32) |