Mercurial > sdl-ios-xcode
view src/audio/nto/SDL_nto_audio.h @ 4427:eada7e321df6 SDL-1.2
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:04:13 +0000 |
parents | a1b03ba2fcd0 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" #ifndef __SDL_NTO_AUDIO_H__ #define __SDL_NTO_AUDIO_H__ #include <sys/asoundlib.h> #include "../SDL_sysaudio.h" /* Hidden "this" pointer for the audio functions */ #define _THIS SDL_AudioDevice *this struct SDL_PrivateAudioData { /* The audio device handle */ int cardno; int deviceno; snd_pcm_t* audio_handle; /* The audio file descriptor */ int audio_fd; /* The parent process id, to detect when application quits */ pid_t parent; /* Raw mixing buffer */ Uint8* pcm_buf; Uint32 pcm_len; /* QSA parameters */ snd_pcm_channel_status_t cstatus; snd_pcm_channel_params_t cparams; snd_pcm_channel_setup_t csetup; }; #define cardno (this->hidden->cardno) #define deviceno (this->hidden->deviceno) #define audio_handle (this->hidden->audio_handle) #define audio_fd (this->hidden->audio_fd) #define parent (this->hidden->parent) #define pcm_buf (this->hidden->pcm_buf) #define pcm_len (this->hidden->pcm_len) #define cstatus (this->hidden->cstatus) #define cparams (this->hidden->cparams) #define csetup (this->hidden->csetup) #endif /* __SDL_NTO_AUDIO_H__ */