Rename SDL mutex, semaphore and condition variable types to match SDL 3.0 naming convention
This commit is contained in:
@@ -354,7 +354,7 @@ struct SDL_VideoDevice
|
||||
SDL_bool is_dummy;
|
||||
SDL_bool suspend_screensaver;
|
||||
SDL_Window *wakeup_window;
|
||||
SDL_mutex *wakeup_lock; /* Initialized only if WaitEventTimeout/SendWakeupEvent are supported */
|
||||
SDL_Mutex *wakeup_lock; /* Initialized only if WaitEventTimeout/SendWakeupEvent are supported */
|
||||
int num_displays;
|
||||
SDL_VideoDisplay *displays;
|
||||
SDL_Window *windows;
|
||||
|
||||
@@ -62,9 +62,9 @@ static int Android_DeviceHeight = 0;
|
||||
static Uint32 Android_ScreenFormat = SDL_PIXELFORMAT_RGB565; /* Default SurfaceView format, in case this is queried before being filled */
|
||||
float Android_ScreenDensity = 1.0f;
|
||||
static float Android_ScreenRate = 0.0f;
|
||||
SDL_sem *Android_PauseSem = NULL;
|
||||
SDL_sem *Android_ResumeSem = NULL;
|
||||
SDL_mutex *Android_ActivityMutex = NULL;
|
||||
SDL_Semaphore *Android_PauseSem = NULL;
|
||||
SDL_Semaphore *Android_ResumeSem = NULL;
|
||||
SDL_Mutex *Android_ActivityMutex = NULL;
|
||||
static SDL_SystemTheme Android_SystemTheme;
|
||||
|
||||
static int Android_SuspendScreenSaver(_THIS)
|
||||
|
||||
@@ -44,7 +44,7 @@ struct SDL_VideoData
|
||||
extern int Android_SurfaceWidth;
|
||||
extern int Android_SurfaceHeight;
|
||||
extern float Android_ScreenDensity;
|
||||
extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
|
||||
extern SDL_mutex *Android_ActivityMutex;
|
||||
extern SDL_Semaphore *Android_PauseSem, *Android_ResumeSem;
|
||||
extern SDL_Mutex *Android_ActivityMutex;
|
||||
|
||||
#endif /* SDL_androidvideo_h_ */
|
||||
|
||||
@@ -45,9 +45,9 @@ struct SDL_GLDriverData
|
||||
SDL_Window *window;
|
||||
CVDisplayLinkRef displayLink;
|
||||
@public
|
||||
SDL_mutex *swapIntervalMutex;
|
||||
SDL_Mutex *swapIntervalMutex;
|
||||
@public
|
||||
SDL_cond *swapIntervalCond;
|
||||
SDL_Condition *swapIntervalCond;
|
||||
@public
|
||||
SDL_AtomicInt swapIntervalSetting;
|
||||
@public
|
||||
|
||||
@@ -104,7 +104,7 @@ DECLARE_ALERT_STYLE(Critical);
|
||||
@property(nonatomic) SDLTranslatorResponder *fieldEdit;
|
||||
@property(nonatomic) NSInteger clipboard_count;
|
||||
@property(nonatomic) IOPMAssertionID screensaver_assertion;
|
||||
@property(nonatomic) SDL_mutex *swaplock;
|
||||
@property(nonatomic) SDL_Mutex *swaplock;
|
||||
@end
|
||||
|
||||
/* Utility functions */
|
||||
|
||||
@@ -45,7 +45,7 @@ static SDL_Keycode keymap[256];
|
||||
#endif
|
||||
|
||||
static enum PspHprmKeys hprm = 0;
|
||||
static SDL_sem *event_sem = NULL;
|
||||
static SDL_Semaphore *event_sem = NULL;
|
||||
static SDL_Thread *thread = NULL;
|
||||
static int running = 0;
|
||||
static struct
|
||||
|
||||
@@ -46,8 +46,8 @@ struct SDL_WindowData
|
||||
#endif
|
||||
|
||||
/* Vsync callback cond and mutex */
|
||||
SDL_cond *vsync_cond;
|
||||
SDL_mutex *vsync_cond_mutex;
|
||||
SDL_Condition *vsync_cond;
|
||||
SDL_Mutex *vsync_cond_mutex;
|
||||
SDL_bool double_buffer;
|
||||
};
|
||||
|
||||
|
||||
@@ -68,8 +68,8 @@ enum SDL_XAMLAppThreadState
|
||||
|
||||
static SDL_XAMLAppThreadState _threadState = ThreadState_NotLaunched;
|
||||
static SDL_Thread *_XAMLThread = nullptr;
|
||||
static SDL_mutex *_mutex = nullptr;
|
||||
static SDL_cond *_cond = nullptr;
|
||||
static SDL_Mutex *_mutex = nullptr;
|
||||
static SDL_Condition *_cond = nullptr;
|
||||
|
||||
static void WINRT_YieldXAMLThread()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user