Select patches included from The NetBSD Package Collection (www.pkgsrc.org)
authorSam Lantinga <slouken@libsdl.org>
Wed, 12 Jan 2005 06:04:48 +0000
changeset 10260f3aa6ab3341
parent 1025 3652d111416c
child 1027 c69697a85412
Select patches included from The NetBSD Package Collection (www.pkgsrc.org)
include/SDL_endian.h
include/SDL_syswm.h
src/audio/SDL_audiodev.c
src/cdrom/openbsd/SDL_syscdrom.c
     1.1 --- a/include/SDL_endian.h	Sat Jan 08 23:13:01 2005 +0000
     1.2 +++ b/include/SDL_endian.h	Wed Jan 12 06:04:48 2005 +0000
     1.3 @@ -68,7 +68,7 @@
     1.4  #elif defined(__GNUC__) && defined(__x86_64__)
     1.5  static __inline__ Uint16 SDL_Swap16(Uint16 x)
     1.6  {
     1.7 -	__asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
     1.8 +	__asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
     1.9  	return x;
    1.10  }
    1.11  #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
     2.1 --- a/include/SDL_syswm.h	Sat Jan 08 23:13:01 2005 +0000
     2.2 +++ b/include/SDL_syswm.h	Wed Jan 12 06:04:48 2005 +0000
     2.3 @@ -49,7 +49,7 @@
     2.4  #else
     2.5  
     2.6  /* This is the structure for custom window manager events */
     2.7 -#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
     2.8 +#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
     2.9      (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
    2.10       !defined(__QNXNTO__))
    2.11   /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
     3.1 --- a/src/audio/SDL_audiodev.c	Sat Jan 08 23:13:01 2005 +0000
     3.2 +++ b/src/audio/SDL_audiodev.c	Wed Jan 12 06:04:48 2005 +0000
     3.3 @@ -39,7 +39,7 @@
     3.4  #include "SDL_audiodev_c.h"
     3.5  
     3.6  #ifndef _PATH_DEV_DSP
     3.7 -#ifdef __OpenBSD__
     3.8 +#if defined(__NetBSD__) || defined(__OpenBSD__)
     3.9  #define _PATH_DEV_DSP  "/dev/audio"
    3.10  #else
    3.11  #define _PATH_DEV_DSP  "/dev/dsp"
     4.1 --- a/src/cdrom/openbsd/SDL_syscdrom.c	Sat Jan 08 23:13:01 2005 +0000
     4.2 +++ b/src/cdrom/openbsd/SDL_syscdrom.c	Wed Jan 12 06:04:48 2005 +0000
     4.3 @@ -143,6 +143,8 @@
     4.4  	static char *checklist[] = {
     4.5  #ifdef __OpenBSD__
     4.6  		"?0 cd?c", "cdrom", NULL
     4.7 +#elif defined(__NetBSD__)
     4.8 +		"?0 cd?d", "?0 cd?c", "cdrom", NULL
     4.9  #else
    4.10  		"?0 cd?c", "?0 acd?c", "cdrom", NULL
    4.11  #endif