33c1d70e11
functions. Don't use non-literal strings as format strings. Use z for size_t on NetBSD. Fix inline assembler syntax of inl.
50 lines
1.8 KiB
Text
50 lines
1.8 KiB
Text
$NetBSD: patch-ax,v 1.5 2012/12/25 21:02:15 joerg Exp $
|
|
|
|
--- lib/include/vm_basic_types.h.orig 2008-08-08 07:01:52.000000000 +0000
|
|
+++ lib/include/vm_basic_types.h
|
|
@@ -41,7 +41,7 @@
|
|
#include "includeCheck.h"
|
|
|
|
/* STRICT ANSI means the Xserver build and X defines Bool differently. */
|
|
-#if !defined(__STRICT_ANSI__) || defined(__FreeBSD__)
|
|
+#if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
|
typedef char Bool;
|
|
#endif
|
|
|
|
@@ -151,7 +151,7 @@ typedef char int8;
|
|
#endif
|
|
|
|
#if !defined(USING_AUTOCONF)
|
|
-# if defined(__FreeBSD__) || defined(sun)
|
|
+# if defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
|
|
# ifdef KLD_MODULE
|
|
# include <sys/types.h>
|
|
# else
|
|
@@ -244,7 +244,7 @@ typedef int64 VmTimeVirtualClock; /* Vi
|
|
#define FMTSZ ""
|
|
#define FMTPD ""
|
|
#endif
|
|
- #elif defined(__linux__) \
|
|
+ #elif defined(__linux__) || defined(__NetBSD__) \
|
|
|| (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) \
|
|
|| (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
|
|
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
|
|
@@ -267,7 +267,7 @@ typedef int64 VmTimeVirtualClock; /* Vi
|
|
#endif
|
|
#ifdef VM_X86_64
|
|
#define FMT64 "l"
|
|
- #elif defined(sun) || defined(__APPLE__) || defined(__FreeBSD__)
|
|
+ #elif defined(sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
|
#define FMT64 "ll"
|
|
#else
|
|
#define FMT64 "L"
|
|
@@ -717,7 +717,8 @@ typedef void * UserVA;
|
|
* On FreeBSD (for the tools build), size_t is typedef'd if _BSD_SIZE_T_
|
|
* is defined. Use the same logic here so we don't define it twice. [greg]
|
|
*/
|
|
-#ifdef __FreeBSD__
|
|
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|
|
+# include <sys/types.h>
|
|
# ifdef _BSD_SIZE_T_
|
|
# undef _BSD_SIZE_T_
|
|
# ifdef VM_I386
|