Module Name: src
Committed By: christos
Date: Sun Feb 17 00:34:11 UTC 2013
Modified Files:
src/tools/compat: compat_defs.h configure.ac
Log Message:
cygwin defines u_quad_t in <rpc/types.h>, so include this to the headers
we include and test by default.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.74 -r1.75 src/tools/compat/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.86 src/tools/compat/compat_defs.h:1.87
--- src/tools/compat/compat_defs.h:1.86 Mon Jun 4 06:18:01 2012
+++ src/tools/compat/compat_defs.h Sat Feb 16 19:34:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_defs.h,v 1.86 2012/06/04 10:18:01 joerg Exp $ */
+/* $NetBSD: compat_defs.h,v 1.87 2013/02/17 00:34:11 christos Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
@@ -62,6 +62,10 @@
#include <stddef.h>
#endif
+#if HAVE_RPC_TYPES_H
+#include <rpc/types.h>
+#endif
+
#ifdef _NETBSD_SOURCE
#error _NETBSD_SOURCE is *not* to be defined.
#endif
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.74 src/tools/compat/configure.ac:1.75
--- src/tools/compat/configure.ac:1.74 Thu Nov 3 10:13:53 2011
+++ src/tools/compat/configure.ac Sat Feb 16 19:34:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.74 2011/11/03 14:13:53 joerg Exp $
+# $NetBSD: configure.ac,v 1.75 2013/02/17 00:34:11 christos Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -79,7 +79,7 @@ AC_CHECK_HEADERS(sys/ioctl.h sys/mman.h
# Find headers that may not be available.
AC_HEADER_DIRENT
AC_CHECK_HEADERS(sys/mtio.h sys/sysmacros.h sys/syslimits.h \
- getopt.h features.h malloc.h sys/poll.h pthread.h stddef.h)
+ getopt.h features.h malloc.h sys/poll.h pthread.h stddef.h rpc/types.h)
AC_CHECK_HEADERS(sys/bswap.h machine/bswap.h sys/cdefs.h machine/endian.h \
sys/endian.h sys/featuretest.h err.h inttypes.h libgen.h paths.h \
stdint.h util.h resolv.h arpa/nameser.h,,
@@ -100,6 +100,7 @@ AC_CHECK_TYPES([id_t, long long, u_long,
AC_CHECK_TYPE(socklen_t, [AC_DEFINE([HAVE_SOCKLEN_T], 1,
[Define if you have the socklen_t type.])],,
[#include <sys/types.h>
+#include <rpc/types.h>
#include <sys/socket.h>])
dnl XXX - This is UGLY. Need a better way to homogenize the bitsized types,
