Module Name: src
Committed By: maya
Date: Wed Jun 13 04:17:43 UTC 2018
Modified Files:
src/tools/compat: compat_defs.h configure configure.ac
nbtool_config.h.in
Log Message:
Revert my previous config test inclusion for u_longlong_t.
Fixing this differently by avoiding the need for the definition.
It also caused a problem in OS X, as I neglected to include a correct header
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.89 -r1.90 src/tools/compat/configure
cvs rdiff -u -r1.90 -r1.91 src/tools/compat/configure.ac
cvs rdiff -u -r1.43 -r1.44 src/tools/compat/nbtool_config.h.in
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.111 src/tools/compat/compat_defs.h:1.112
--- src/tools/compat/compat_defs.h:1.111 Tue Jun 12 23:52:56 2018
+++ src/tools/compat/compat_defs.h Wed Jun 13 04:17:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_defs.h,v 1.111 2018/06/12 23:52:56 christos Exp $ */
+/* $NetBSD: compat_defs.h,v 1.112 2018/06/13 04:17:43 maya Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
@@ -68,10 +68,6 @@ typedef unsigned int u_int;
typedef unsigned short u_short;
#endif
-#if !HAVE_U_LONGLONG_T
-typedef uint64_t u_longlong_t;
-#endif
-
/* System headers needed for (re)definitions below. */
#include <sys/types.h>
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.89 src/tools/compat/configure:1.90
--- src/tools/compat/configure:1.89 Mon Jun 11 18:48:25 2018
+++ src/tools/compat/configure Wed Jun 13 04:17:43 2018
@@ -4227,17 +4227,6 @@ _ACEOF
fi
-ac_fn_c_check_type "$LINENO" "u_longlong_t" "ac_cv_type_u_longlong_t" "#include <sys/types.h>
-"
-if test "x$ac_cv_type_u_longlong_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_U_LONGLONG_T 1
-_ACEOF
-
-
-fi
-
ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include <sys/types.h>
#ifdef HAVE_RPC_TYPES_H
#include <rpc/types.h>
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.90 src/tools/compat/configure.ac:1.91
--- src/tools/compat/configure.ac:1.90 Mon Jun 11 18:48:25 2018
+++ src/tools/compat/configure.ac Wed Jun 13 04:17:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.90 2018/06/11 18:48:25 maya Exp $
+# $NetBSD: configure.ac,v 1.91 2018/06/13 04:17:43 maya Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -97,7 +97,6 @@ AC_CHECK_HEADERS(rpc/types.h netconfig.h
# Typedefs.
AC_TYPE_SIZE_T
AC_CHECK_TYPES([id_t, long long, u_long, u_char, u_short, u_int, u_quad_t])
-AC_CHECK_TYPES([u_longlong_t],,, [#include <sys/types.h>])
AC_CHECK_TYPE(socklen_t, [AC_DEFINE([HAVE_SOCKLEN_T], 1,
[Define if you have the socklen_t type.])],,
[#include <sys/types.h>
Index: src/tools/compat/nbtool_config.h.in
diff -u src/tools/compat/nbtool_config.h.in:1.43 src/tools/compat/nbtool_config.h.in:1.44
--- src/tools/compat/nbtool_config.h.in:1.43 Mon Jun 11 18:48:25 2018
+++ src/tools/compat/nbtool_config.h.in Wed Jun 13 04:17:43 2018
@@ -1,6 +1,6 @@
/* nbtool_config.h.in. Generated from configure.ac by autoheader. */
-/* $NetBSD: nbtool_config.h.in,v 1.43 2018/06/11 18:48:25 maya Exp $ */
+/* $NetBSD: nbtool_config.h.in,v 1.44 2018/06/13 04:17:43 maya Exp $ */
#ifndef __NETBSD_NBTOOL_CONFIG_H__
#define __NETBSD_NBTOOL_CONFIG_H__
@@ -780,9 +780,6 @@
/* Define to 1 if the system has the type `u_long'. */
#undef HAVE_U_LONG
-/* Define to 1 if the system has the type `u_longlong_t'. */
-#undef HAVE_U_LONGLONG_T
-
/* Define to 1 if the system has the type `u_quad_t'. */
#undef HAVE_U_QUAD_T
