Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tools/compat Revert my previous config test inclusion for u_...



details:   https://anonhg.NetBSD.org/src/rev/5cf60bca69a0
branches:  trunk
changeset: 362488:5cf60bca69a0
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Jun 13 04:17:43 2018 +0000

description:
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

diffstat:

 tools/compat/compat_defs.h      |   6 +-----
 tools/compat/configure          |  11 -----------
 tools/compat/configure.ac       |   3 +--
 tools/compat/nbtool_config.h.in |   5 +----
 4 files changed, 3 insertions(+), 22 deletions(-)

diffs (79 lines):

diff -r 157e47a8b113 -r 5cf60bca69a0 tools/compat/compat_defs.h
--- a/tools/compat/compat_defs.h        Wed Jun 13 03:34:13 2018 +0000
+++ b/tools/compat/compat_defs.h        Wed Jun 13 04:17:43 2018 +0000
@@ -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 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>
diff -r 157e47a8b113 -r 5cf60bca69a0 tools/compat/configure
--- a/tools/compat/configure    Wed Jun 13 03:34:13 2018 +0000
+++ b/tools/compat/configure    Wed Jun 13 04:17:43 2018 +0000
@@ -4227,17 +4227,6 @@
 
 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>
diff -r 157e47a8b113 -r 5cf60bca69a0 tools/compat/configure.ac
--- a/tools/compat/configure.ac Wed Jun 13 03:34:13 2018 +0000
+++ b/tools/compat/configure.ac Wed Jun 13 04:17:43 2018 +0000
@@ -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 @@
 # 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>
diff -r 157e47a8b113 -r 5cf60bca69a0 tools/compat/nbtool_config.h.in
--- a/tools/compat/nbtool_config.h.in   Wed Jun 13 03:34:13 2018 +0000
+++ b/tools/compat/nbtool_config.h.in   Wed Jun 13 04:17:43 2018 +0000
@@ -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
 



Home | Main Index | Thread Index | Old Index