Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed a bunch of compile warnings on Mac OS X

  • Loading branch information
slouken committed Sep 1, 2008
1 parent b412649 commit cfaa0f2ecde8a641b0e64e2e8a2ad220fdc86324
@@ -1622,7 +1622,6 @@ int
SDL_BuildWindowedSinc(SDL_AudioCVT * cvt, SDL_AudioFormat format,
unsigned int m)
{
float fScale; /* scale factor for fixed point */
float *fSinc; /* floating point sinc buffer, to be converted to fixed point */
float fc; /* cutoff frequency */
float two_pi_fc, two_pi_over_m, four_pi_over_m, m_over_two;
@@ -1708,6 +1707,8 @@ SDL_BuildWindowedSinc(SDL_AudioCVT * cvt, SDL_AudioFormat format,
/* Clean up */
#undef convert_fixed
SDL_stack_free(fSinc);

return 0;
}

/* This is used to reduce the resampling ratio */
@@ -418,7 +418,6 @@ prepare_audiounit(_THIS, const char *devname, int iscapture,
AURenderCallbackStruct callback;
ComponentDescription desc;
Component comp = NULL;
int use_system_device = 0;
UInt32 enableIO = 0;
const AudioUnitElement output_bus = 0;
const AudioUnitElement input_bus = 1;
@@ -89,6 +89,7 @@ mix_buffer(SDL_AudioDevice * audio, UInt8 * buffer)
DecrementAtomic((SInt32 *) & need_to_mix);
}

#ifndef __MACOSX__
static void
SNDMGR_LockDevice(_THIS)
{
@@ -114,6 +115,7 @@ SNDMGR_UnlockDevice(_THIS)
mix_buffer(this, buffer[fill_me]);
}
}
#endif // __MACOSX__

static void
callBackProc(SndChannel * chan, SndCommand * cmd_passed)
@@ -22,6 +22,7 @@
#include "SDL_config.h"

#include "SDL_cocoavideo.h"
#include "../../events/SDL_events_c.h"

/* setAppleMenu disappeared from the headers in 10.4 */
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
@@ -27,6 +27,7 @@

#if SDL_VIDEO_OPENGL_CGL
#include <OpenGL/CGLTypes.h>
#include <OpenGL/OpenGL.h>

#include "SDL_loadso.h"
#include "SDL_opengl.h"
@@ -201,7 +201,7 @@ X11_DispatchEvent(_THIS)
#ifdef X_HAVE_UTF8_STRING
if (data->ic) {
Xutf8LookupString(data->ic, &xevent.xkey, text, sizeof(text),
&keysym, status);
&keysym, &status);
}
#else
XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL);
@@ -69,7 +69,7 @@ typedef struct SDL_VideoData
int numwindows;
SDL_WindowData **windowlist;
int windowlistlength;
int *mouse;
int mouse;
int keyboard;
Atom WM_DELETE_WINDOW;
SDL_scancode key_layout[256];

0 comments on commit cfaa0f2

Please sign in to comment.