Skip to content

Commit

Permalink
updated platform macro usage after latest SDL3.
Browse files Browse the repository at this point in the history
  • Loading branch information
sezero committed Jan 24, 2024
1 parent 3c8461d commit 49ff769
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/codecs/music_timidity.c
Expand Up @@ -45,9 +45,9 @@ static void TIMIDITY_Delete(void *context);
/* Config file should contain any other directory that needs
* to be added to the search path. The library adds the path
* of the config file to its search path, too. */
#if defined(__WIN32__)
#if defined(SDL_PLATFORM_WIN32)
# define TIMIDITY_CFG "C:\\TIMIDITY\\TIMIDITY.CFG"
#elif defined(__OS2__)
#elif defined(SDL_PLATFORM_OS2)
# define TIMIDITY_CFG "C:\\TIMIDITY\\TIMIDITY.CFG"
# define TIMIDITY_CFG_ETC "/@unixroot/etc/timidity/timidity.cfg"
#else /* unix: */
Expand Down
4 changes: 2 additions & 2 deletions src/codecs/native_midi/native_midi_haiku.cpp
Expand Up @@ -20,7 +20,7 @@
*/
#include <SDL3/SDL_platform.h>

#ifdef __HAIKU__
#ifdef SDL_PLATFORM_HAIKU
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -292,4 +292,4 @@ const char* native_midi_error(void)
return lasterr;
}

#endif /* __HAIKU__ */
#endif /* SDL_PLATFORM_HAIKU */
2 changes: 1 addition & 1 deletion src/codecs/native_midi/native_midi_macosx.c
Expand Up @@ -21,7 +21,7 @@

#include <SDL3/SDL_platform.h>

#if __MACOS__
#ifdef SDL_PLATFORM_MACOS

/* Mac OS X 10.6+, using Core MIDI. */

Expand Down
2 changes: 1 addition & 1 deletion src/codecs/native_midi/native_midi_win32.c
Expand Up @@ -22,7 +22,7 @@

/* everything below is currently one very big bad hack ;) Proff */

#if __WIN32__
#ifdef SDL_PLATFORM_WIN32
#define WIN32_LEAN_AND_MEAN

#include <windows.h>
Expand Down
2 changes: 1 addition & 1 deletion src/codecs/timidity/common.c
Expand Up @@ -13,7 +13,7 @@
#include "options.h"
#include "common.h"

#if defined(__WIN32__) || defined(__OS2__)
#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_OS2)
#define CHAR_DIRSEP '\\'
#define is_dirsep(c) ((c) == '/' || (c) == '\\')
#define is_abspath(p) ((p)[0] == '/' || (p)[0] == '\\' || ((p)[0] && (p)[1] == ':'))
Expand Down

0 comments on commit 49ff769

Please sign in to comment.