Module Name: src
Committed By: kamil
Date: Wed Jun 19 23:33:07 UTC 2019
Modified Files:
src/tools/compat: compat_defs.h configure.ac
Log Message:
Add more SunOS types to tools/compat
Add fallback defintions of: uchar_t, ushort_t, uint_t, ulong_t.
Needed by the libctf code on Ubuntu 16.x.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.95 -r1.96 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.115 src/tools/compat/compat_defs.h:1.116
--- src/tools/compat/compat_defs.h:1.115 Wed Jun 19 03:40:15 2019
+++ src/tools/compat/compat_defs.h Wed Jun 19 23:33:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_defs.h,v 1.115 2019/06/19 03:40:15 kamil Exp $ */
+/* $NetBSD: compat_defs.h,v 1.116 2019/06/19 23:33:07 kamil Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
@@ -79,6 +79,22 @@ typedef unsigned int u_int;
typedef unsigned short u_short;
#endif
+#if !HAVE_UCHAR_T
+typedef unsigned char uchar_t;
+#endif
+
+#if !HAVE_USHORT_T
+typedef unsigned short ushort_t;
+#endif
+
+#if !HAVE_UINT_T
+typedef unsigned int uint_t;
+#endif
+
+#if !HAVE_ULONG_T
+typedef unsigned long ulong_t;
+#endif
+
/* System headers needed for (re)definitions below. */
#include <sys/types.h>
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.95 src/tools/compat/configure.ac:1.96
--- src/tools/compat/configure.ac:1.95 Wed Jun 19 03:40:15 2019
+++ src/tools/compat/configure.ac Wed Jun 19 23:33:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.95 2019/06/19 03:40:15 kamil Exp $
+# $NetBSD: configure.ac,v 1.96 2019/06/19 23:33:07 kamil Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -98,6 +98,7 @@ 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([uchar_t, ushort_t, uint_t, ulong_t])
AC_CHECK_TYPE(socklen_t, [AC_DEFINE([HAVE_SOCKLEN_T], 1,
[Define if you have the socklen_t type.])],,
[#include <sys/types.h>
