Module Name: src
Committed By: martin
Date: Thu Oct 3 16:14:25 UTC 2024
Modified Files:
src/external/cddl/osnet/sys/sys [netbsd-10]: types.h
Log Message:
Pull up following revision(s) (requested by rin in ticket #923):
external/cddl/osnet/sys/sys/types.h: revision 1.21
- Remove conditional code for HAVE_NBTOOLS_CONFIG_H. The variable name was
wrong anyway (it is HAVE_NBTOOL_CONFIG_H) so the code never worked as
intended.
- Do not define _NETBSD_SOURCE even temporarily. It broke the tools
build because <sys/types.h> includes <sys/endian.h> and with _NETBSD_SOURCE
defined, this exposes the *enc and *dec functions which libctf redefines
if it thinks that the system does not define them (and nbtools_config.h
tells libctf that we are not defining them).
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.12.1 src/external/cddl/osnet/sys/sys/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.20 src/external/cddl/osnet/sys/sys/types.h:1.20.12.1
--- src/external/cddl/osnet/sys/sys/types.h:1.20 Sun Jun 3 05:55:08 2018
+++ src/external/cddl/osnet/sys/sys/types.h Thu Oct 3 16:14:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.20 2018/06/03 05:55:08 chs Exp $ */
+/* $NetBSD: types.h,v 1.20.12.1 2024/10/03 16:14:25 martin Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -72,17 +72,8 @@
#include <sys/stdint.h>
#endif
-#ifndef HAVE_NBTOOLS_CONFIG_H
-#ifdef _NETBSD_SOURCE
#include_next <sys/types.h>
#include_next <sys/ccompile.h>
-#else
-#define _NETBSD_SOURCE
-#include_next <sys/types.h>
-#include_next <sys/ccompile.h>
-#undef _NETBSD_SOURCE
-#endif
-#endif
#undef longlong_t
#undef u_longlong_t
