From f5be80d86f37bc2e2d8a47dffd80650ce4aa2531 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Wed, 12 Jan 2005 06:04:48 +0000
Subject: [PATCH] Select patches included from The NetBSD Package Collection
 (www.pkgsrc.org)

---
 include/SDL_endian.h             | 2 +-
 include/SDL_syswm.h              | 2 +-
 src/audio/SDL_audiodev.c         | 2 +-
 src/cdrom/openbsd/SDL_syscdrom.c | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/SDL_endian.h b/include/SDL_endian.h
index 6fe37460f..327fe1791 100644
--- a/include/SDL_endian.h
+++ b/include/SDL_endian.h
@@ -68,7 +68,7 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
 #elif defined(__GNUC__) && defined(__x86_64__)
 static __inline__ Uint16 SDL_Swap16(Uint16 x)
 {
-	__asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
+	__asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
 	return x;
 }
 #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h
index ac351987d..9149b23b4 100644
--- a/include/SDL_syswm.h
+++ b/include/SDL_syswm.h
@@ -49,7 +49,7 @@ typedef struct SDL_SysWMinfo SDL_SysWMinfo;
 #else
 
 /* This is the structure for custom window manager events */
-#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
+#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
     (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
      !defined(__QNXNTO__))
  /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
diff --git a/src/audio/SDL_audiodev.c b/src/audio/SDL_audiodev.c
index 8ed6e4f04..c3f3be33f 100644
--- a/src/audio/SDL_audiodev.c
+++ b/src/audio/SDL_audiodev.c
@@ -39,7 +39,7 @@ static char rcsid =
 #include "SDL_audiodev_c.h"
 
 #ifndef _PATH_DEV_DSP
-#ifdef __OpenBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #define _PATH_DEV_DSP  "/dev/audio"
 #else
 #define _PATH_DEV_DSP  "/dev/dsp"
diff --git a/src/cdrom/openbsd/SDL_syscdrom.c b/src/cdrom/openbsd/SDL_syscdrom.c
index 8475cf4c8..72741b6ef 100644
--- a/src/cdrom/openbsd/SDL_syscdrom.c
+++ b/src/cdrom/openbsd/SDL_syscdrom.c
@@ -143,6 +143,8 @@ int  SDL_SYS_CDInit(void)
 	static char *checklist[] = {
 #ifdef __OpenBSD__
 		"?0 cd?c", "cdrom", NULL
+#elif defined(__NetBSD__)
+		"?0 cd?d", "?0 cd?c", "cdrom", NULL
 #else
 		"?0 cd?c", "?0 acd?c", "cdrom", NULL
 #endif