Select patches included from The NetBSD Package Collection (www.pkgsrc.org)
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401027
This commit is contained in:
parent
21ddee0a10
commit
c73a9384e1
4 changed files with 5 additions and 3 deletions
|
@ -68,7 +68,7 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
|
||||||
#elif defined(__GNUC__) && defined(__x86_64__)
|
#elif defined(__GNUC__) && defined(__x86_64__)
|
||||||
static __inline__ Uint16 SDL_Swap16(Uint16 x)
|
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;
|
return x;
|
||||||
}
|
}
|
||||||
#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
|
#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
|
||||||
|
|
|
@ -49,7 +49,7 @@ typedef struct SDL_SysWMinfo SDL_SysWMinfo;
|
||||||
#else
|
#else
|
||||||
|
|
||||||
/* This is the structure for custom window manager events */
|
/* 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(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
|
||||||
!defined(__QNXNTO__))
|
!defined(__QNXNTO__))
|
||||||
/* AIX is unix, of course, but the native compiler CSet doesn't define unix */
|
/* AIX is unix, of course, but the native compiler CSet doesn't define unix */
|
||||||
|
|
|
@ -39,7 +39,7 @@ static char rcsid =
|
||||||
#include "SDL_audiodev_c.h"
|
#include "SDL_audiodev_c.h"
|
||||||
|
|
||||||
#ifndef _PATH_DEV_DSP
|
#ifndef _PATH_DEV_DSP
|
||||||
#ifdef __OpenBSD__
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||||
#define _PATH_DEV_DSP "/dev/audio"
|
#define _PATH_DEV_DSP "/dev/audio"
|
||||||
#else
|
#else
|
||||||
#define _PATH_DEV_DSP "/dev/dsp"
|
#define _PATH_DEV_DSP "/dev/dsp"
|
||||||
|
|
|
@ -143,6 +143,8 @@ int SDL_SYS_CDInit(void)
|
||||||
static char *checklist[] = {
|
static char *checklist[] = {
|
||||||
#ifdef __OpenBSD__
|
#ifdef __OpenBSD__
|
||||||
"?0 cd?c", "cdrom", NULL
|
"?0 cd?c", "cdrom", NULL
|
||||||
|
#elif defined(__NetBSD__)
|
||||||
|
"?0 cd?d", "?0 cd?c", "cdrom", NULL
|
||||||
#else
|
#else
|
||||||
"?0 cd?c", "?0 acd?c", "cdrom", NULL
|
"?0 cd?c", "?0 acd?c", "cdrom", NULL
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue