mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-06-01 06:44:27 +08:00
make sure #endif comment matches the macro name
(cherry picked from commit a5889b0e44)
This commit is contained in:
committed by
Sam Lantinga
parent
01d8bb5b7c
commit
abab2f1181
@@ -469,7 +469,7 @@
|
|||||||
#define NULL ((void *)0)
|
#define NULL ((void *)0)
|
||||||
#endif
|
#endif
|
||||||
#endif /* NULL */
|
#endif /* NULL */
|
||||||
#endif /* ! macOS - breaks precompiled headers */
|
#endif /* __MACH__ */
|
||||||
|
|
||||||
#ifndef SDL_FALLTHROUGH
|
#ifndef SDL_FALLTHROUGH
|
||||||
#if (defined(__cplusplus) && __cplusplus >= 201703L) || \
|
#if (defined(__cplusplus) && __cplusplus >= 201703L) || \
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ _m_prefetch(void *__P)
|
|||||||
#else
|
#else
|
||||||
/* By default, assume that floats words follow the memory system mode. */
|
/* By default, assume that floats words follow the memory system mode. */
|
||||||
#define SDL_FLOATWORDORDER SDL_BYTEORDER
|
#define SDL_FLOATWORDORDER SDL_BYTEORDER
|
||||||
#endif /* __FLOAT_WORD_ORDER__ */
|
#endif /* SDL_WIKI_DOCUMENTATION_SECTION */
|
||||||
#endif /* !SDL_FLOATWORDORDER */
|
#endif /* !SDL_FLOATWORDORDER */
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -257,7 +257,7 @@
|
|||||||
#else
|
#else
|
||||||
/* usually this is empty */
|
/* usually this is empty */
|
||||||
#define SDLMAIN_DECLSPEC
|
#define SDLMAIN_DECLSPEC
|
||||||
#endif /* SDL_MAIN_EXPORTED */
|
#endif /* SDL_WIKI_DOCUMENTATION_SECTION */
|
||||||
|
|
||||||
#if defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE) || defined(SDL_MAIN_USE_CALLBACKS)
|
#if defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE) || defined(SDL_MAIN_USE_CALLBACKS)
|
||||||
#define main SDL_main
|
#define main SDL_main
|
||||||
|
|||||||
+1
-1
@@ -299,7 +299,7 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_WARNING, "Assertion Failed", message, window);
|
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_WARNING, "Assertion Failed", message, window);
|
||||||
#endif // HAVE_STDIO_H
|
#endif // SDL_PLATFORM_PRIVATE_ASSERT
|
||||||
}
|
}
|
||||||
|
|
||||||
// Re-enter fullscreen mode
|
// Re-enter fullscreen mode
|
||||||
|
|||||||
@@ -25,4 +25,4 @@
|
|||||||
// Convert a keysym to an SDL key code
|
// Convert a keysym to an SDL key code
|
||||||
extern SDL_Keycode SDL_GetKeyCodeFromKeySym(Uint32 keysym, Uint32 keycode, SDL_Keymod modifiers);
|
extern SDL_Keycode SDL_GetKeyCodeFromKeySym(Uint32 keysym, Uint32 keycode, SDL_Keymod modifiers);
|
||||||
|
|
||||||
#endif // SDL_keysym_to_scancode_c_h_
|
#endif // SDL_keysym_to_keycode_c_h_
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ static void SDL_EventSignal_Quit(const int sig)
|
|||||||
if (ohandler != SDL_HandleSIG) {
|
if (ohandler != SDL_HandleSIG) {
|
||||||
signal(sig, ohandler);
|
signal(sig, ohandler);
|
||||||
}
|
}
|
||||||
#endif // HAVE_SIGNAL_H
|
#endif // HAVE_SIGACTION
|
||||||
}
|
}
|
||||||
|
|
||||||
// Public functions
|
// Public functions
|
||||||
|
|||||||
@@ -1026,7 +1026,7 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
SDL_SetError("SDL not compiled with stdio support");
|
SDL_SetError("SDL not compiled with stdio support");
|
||||||
#endif // !HAVE_STDIO_H
|
#endif // SDL_PLATFORM_ANDROID
|
||||||
|
|
||||||
return iostr;
|
return iostr;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1327,7 +1327,7 @@ SDL_Renderer *SDL_CreateSoftwareRenderer(SDL_Surface *surface)
|
|||||||
#else
|
#else
|
||||||
SDL_SetError("SDL not built with rendering support");
|
SDL_SetError("SDL not built with rendering support");
|
||||||
return NULL;
|
return NULL;
|
||||||
#endif // !SDL_RENDER_DISABLED
|
#endif // SDL_VIDEO_RENDER_SW
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_Renderer *SDL_GetRenderer(SDL_Window *window)
|
SDL_Renderer *SDL_GetRenderer(SDL_Window *window)
|
||||||
|
|||||||
@@ -20,8 +20,8 @@
|
|||||||
*/
|
*/
|
||||||
#include "SDL_internal.h"
|
#include "SDL_internal.h"
|
||||||
|
|
||||||
#ifndef SDL_syssensor_c_h_
|
#ifndef SDL_syssensor_h_
|
||||||
#define SDL_syssensor_c_h_
|
#define SDL_syssensor_h_
|
||||||
|
|
||||||
// This is the system specific header for the SDL sensor API
|
// This is the system specific header for the SDL sensor API
|
||||||
|
|
||||||
|
|||||||
@@ -718,7 +718,7 @@ int SDL_memcmp(const void *s1, const void *s2, size_t len)
|
|||||||
++s2p;
|
++s2p;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
#endif // HAVE_MEMCMP
|
#endif // SDL_PLATFORM_VITA
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t SDL_strlen(const char *string)
|
size_t SDL_strlen(const char *string)
|
||||||
@@ -1119,7 +1119,7 @@ char *SDL_strnstr(const char *haystack, const char *needle, size_t maxlen)
|
|||||||
--maxlen;
|
--maxlen;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
#endif // HAVE_STRSTR
|
#endif // HAVE_STRNSTR
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_strstr(const char *haystack, const char *needle)
|
char *SDL_strstr(const char *haystack, const char *needle)
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ DEFINE_SSE_FILLRECT(2, Uint16)
|
|||||||
DEFINE_SSE_FILLRECT(4, Uint32)
|
DEFINE_SSE_FILLRECT(4, Uint32)
|
||||||
|
|
||||||
/* *INDENT-ON* */ // clang-format on
|
/* *INDENT-ON* */ // clang-format on
|
||||||
#endif // __SSE__
|
#endif // SDL_SSE_INTRINSICS
|
||||||
|
|
||||||
#ifdef SDL_LSX_INTRINSICS
|
#ifdef SDL_LSX_INTRINSICS
|
||||||
/* *INDENT-OFF* */ // clang-format off
|
/* *INDENT-OFF* */ // clang-format off
|
||||||
@@ -194,7 +194,7 @@ static void SDL_TARGETING("lsx") SDL_FillSurfaceRect##bpp##LSX(Uint8 *pixels, in
|
|||||||
DEFINE_LSX_FILLRECT(4, Uint32)
|
DEFINE_LSX_FILLRECT(4, Uint32)
|
||||||
|
|
||||||
/* *INDENT-ON* */ // clang-format on
|
/* *INDENT-ON* */ // clang-format on
|
||||||
#endif /* __LSX__ */
|
#endif // SDL_LSX_INTRINSICS
|
||||||
|
|
||||||
static void SDL_FillSurfaceRect1(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
|
static void SDL_FillSurfaceRect1(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -228,14 +228,14 @@
|
|||||||
// Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian.
|
// Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian.
|
||||||
#define MINIZ_LITTLE_ENDIAN 1
|
#define MINIZ_LITTLE_ENDIAN 1
|
||||||
#endif
|
#endif
|
||||||
#endif /**/
|
#endif // MINIZ_LITTLE_ENDIAN /* if not defined by SDL */
|
||||||
|
|
||||||
#ifndef MINIZ_USE_UNALIGNED_LOADS_AND_STORES
|
#ifndef MINIZ_USE_UNALIGNED_LOADS_AND_STORES
|
||||||
#if MINIZ_X86_OR_X64_CPU
|
#if MINIZ_X86_OR_X64_CPU
|
||||||
// Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses.
|
// Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses.
|
||||||
#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
|
#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
|
||||||
#endif
|
#endif
|
||||||
#endif /**/
|
#endif // MINIZ_USE_UNALIGNED_LOADS_AND_STORES
|
||||||
|
|
||||||
#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__)
|
#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__)
|
||||||
// Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions).
|
// Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions).
|
||||||
|
|||||||
@@ -3691,7 +3691,7 @@ static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc
|
|||||||
#define TARGETING_SSE2 SDL_TARGETING("sse2") /* Added by SDL */
|
#define TARGETING_SSE2 SDL_TARGETING("sse2") /* Added by SDL */
|
||||||
#else
|
#else
|
||||||
#define TARGETING_SSE2
|
#define TARGETING_SSE2
|
||||||
#endif /* Added by SDL */
|
#endif // STBI_SSE2 /* Added by SDL */
|
||||||
static stbi_uc *TARGETING_SSE2 stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) /* Changed by SDL: TARGETING_SSE2 */
|
static stbi_uc *TARGETING_SSE2 stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) /* Changed by SDL: TARGETING_SSE2 */
|
||||||
{
|
{
|
||||||
// need to generate 2x2 samples for every one in input
|
// need to generate 2x2 samples for every one in input
|
||||||
|
|||||||
Reference in New Issue
Block a user