Renaming of guard header names to quiet -Wreserved-id-macro

2026-05-20 12:34:50 +08:00 · 2017-08-28 00:22:23 -07:00
parent ce2b16445e
commit 0d011ec66d
126 changed files with 421 additions and 382 deletions
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_androidaudio_h
-#define _SDL_androidaudio_h
+#ifndef SDL_androidaudio_h_
+#define SDL_androidaudio_h_

 #include "../SDL_sysaudio.h"

@@ -37,6 +37,6 @@ struct SDL_PrivateAudioData
 void ANDROIDAUDIO_ResumeDevices(void);
 void ANDROIDAUDIO_PauseDevices(void);

-#endif /* _SDL_androidaudio_h */
+#endif /* SDL_androidaudio_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_artsaudio_h
-#define _SDL_artsaudio_h
+#ifndef SDL_artsaudio_h_
+#define SDL_artsaudio_h_

 #include <artsc.h>

@@ -48,6 +48,6 @@ struct SDL_PrivateAudioData
 };
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */

-#endif /* _SDL_artsaudio_h */
+#endif /* SDL_artsaudio_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_coreaudio_h
-#define _SDL_coreaudio_h
+#ifndef SDL_coreaudio_h_
+#define SDL_coreaudio_h_

 #include "../SDL_sysaudio.h"

@@ -63,5 +63,6 @@ struct SDL_PrivateAudioData
 #endif
 };

-#endif /* _SDL_coreaudio_h */
+#endif /* SDL_coreaudio_h_ */
+
 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_directsound_h
-#define _SDL_directsound_h
+#ifndef SDL_directsound_h_
+#define SDL_directsound_h_

 #include "../../core/windows/SDL_directx.h"

@@ -42,6 +42,6 @@ struct SDL_PrivateAudioData
    Uint8 *locked_buf;
 };

-#endif /* _SDL_directsound_h */
+#endif /* SDL_directsound_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_emscriptenaudio_h
-#define _SDL_emscriptenaudio_h
+#ifndef SDL_emscriptenaudio_h_
+#define SDL_emscriptenaudio_h_

 #include "../SDL_sysaudio.h"

@@ -33,5 +33,6 @@ struct SDL_PrivateAudioData
    int unused;
 };

-#endif /* _SDL_emscriptenaudio_h */
+#endif /* SDL_emscriptenaudio_h_ */
+
 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_esdaudio_h
-#define _SDL_esdaudio_h
+#ifndef SDL_esdaudio_h_
+#define SDL_esdaudio_h_

 #include "../SDL_sysaudio.h"

@@ -46,5 +46,6 @@ struct SDL_PrivateAudioData
 };
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */

-#endif /* _SDL_esdaudio_h */
+#endif /* SDL_esdaudio_h_ */
+
 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_fsaudio_h
-#define _SDL_fsaudio_h
+#ifndef SDL_fsaudio_h_
+#define SDL_fsaudio_h_

 #include <fusionsound/fusionsound.h>

@@ -45,5 +45,6 @@ struct SDL_PrivateAudioData

 };

-#endif /* _SDL_fsaudio_h */
+#endif /* SDL_fsaudio_h_ */
+
 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_haikuaudio_h
-#define _SDL_haikuaudio_h
+#ifndef SDL_haikuaudio_h_
+#define SDL_haikuaudio_h_

 #include "../SDL_sysaudio.h"

@@ -33,6 +33,6 @@ struct SDL_PrivateAudioData
    BSoundPlayer *audio_obj;
 };

-#endif /* _SDL_haikuaudio_h */
+#endif /* SDL_haikuaudio_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -18,8 +18,8 @@
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef _SDL_jackaudio_h
-#define _SDL_jackaudio_h
+#ifndef SDL_jackaudio_h_
+#define SDL_jackaudio_h_

 #include <jack/jack.h>

@@ -37,6 +37,6 @@ struct SDL_PrivateAudioData
    jack_port_t **sdlports;
 };

-#endif /* _SDL_jackaudio_h */
+#endif /* SDL_jackaudio_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -21,8 +21,8 @@

 #include "../../SDL_internal.h"

-#ifndef _SDL_naclaudio_h
-#define _SDL_naclaudio_h
+#ifndef SDL_naclaudio_h_
+#define SDL_naclaudio_h_

 #include "SDL_audio.h"
 #include "../SDL_sysaudio.h"
@@ -38,4 +38,6 @@ typedef struct SDL_PrivateAudioData {
  PP_Resource audio;
 } SDL_PrivateAudioData;

-#endif /* _SDL_naclaudio_h */
+#endif /* SDL_naclaudio_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_netbsdaudio_h
-#define _SDL_netbsdaudio_h
+#ifndef SDL_netbsdaudio_h_
+#define SDL_netbsdaudio_h_

 #include "../SDL_sysaudio.h"

@@ -43,6 +43,6 @@ struct SDL_PrivateAudioData

 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */

-#endif /* _SDL_netbsdaudio_h */
+#endif /* SDL_netbsdaudio_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_paudio_h
-#define _SDL_paudio_h
+#ifndef SDL_paudio_h_
+#define SDL_paudio_h_

 #include "../SDL_sysaudio.h"

@@ -43,6 +43,6 @@ struct SDL_PrivateAudioData
 };
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */

-#endif /* _SDL_paudio_h */
+#endif /* SDL_paudio_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -19,8 +19,8 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_pspaudio_h
-#define _SDL_pspaudio_h
+#ifndef SDL_pspaudio_h_
+#define SDL_pspaudio_h_

 #include "../SDL_sysaudio.h"

@@ -40,6 +40,6 @@ struct SDL_PrivateAudioData {
    int     next_buffer;
 };

-#endif /* _SDL_pspaudio_h */
-/* vim: ts=4 sw=4
- */
+#endif /* SDL_pspaudio_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_sndioaudio_h
-#define _SDL_sndioaudio_h
+#ifndef SDL_sndioaudio_h_
+#define SDL_sndioaudio_h_

 #include <poll.h>
 #include <sndio.h>
@@ -44,6 +44,6 @@ struct SDL_PrivateAudioData
    struct pollfd *pfd;
 };

-#endif /* _SDL_sndioaudio_h */
+#endif /* SDL_sndioaudio_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_sunaudio_h
-#define _SDL_sunaudio_h
+#ifndef SDL_sunaudio_h_
+#define SDL_sunaudio_h_

 #include "../SDL_sysaudio.h"

@@ -42,6 +42,6 @@ struct SDL_PrivateAudioData
    int frequency;              /* The audio frequency in KHz */
 };

-#endif /* _SDL_sunaudio_h */
+#endif /* SDL_sunaudio_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_winmm_h
-#define _SDL_winmm_h
+#ifndef SDL_winmm_h_
+#define SDL_winmm_h_

 #include "../SDL_sysaudio.h"

@@ -40,6 +40,6 @@ struct SDL_PrivateAudioData
    int next_buffer;
 };

-#endif /* _SDL_winmm_h */
+#endif /* SDL_winmm_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -19,8 +19,8 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_XAUDIO2_H
-#define _SDL_XAUDIO2_H
+#ifndef SDL_XAUDIO2_H_
+#define SDL_XAUDIO2_H_

 #include <windows.h>
 #include <mmreg.h>
@@ -381,6 +381,6 @@ const struct IXAudio2VoiceCallbackVtbl

 #pragma pack(pop)   /* Undo pragma push */

-#endif  /* _SDL_XAUDIO2_H */
+#endif  /* SDL_XAUDIO2_H_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_directx_h
-#define _SDL_directx_h
+#ifndef SDL_directx_h_
+#define SDL_directx_h_

 /* Include all of the DirectX 8.0 headers and adds any necessary tweaks */

@@ -106,6 +106,6 @@
 typedef struct { int unused; } DIDEVICEINSTANCE;
 #endif

-#endif /* _SDL_directx_h */
+#endif /* SDL_directx_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_xinput_h
-#define _SDL_xinput_h
+#ifndef SDL_xinput_h_
+#define SDL_xinput_h_

 #ifdef HAVE_XINPUT_H

@@ -172,6 +172,6 @@ extern DWORD SDL_XInputVersion;  /* ((major << 16) & 0xFF00) | (minor & 0xFF) */

 #endif /* HAVE_XINPUT_H */

-#endif /* _SDL_xinput_h */
+#endif /* SDL_xinput_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,12 +20,12 @@
 */
 #include "SDL_config.h"

-#ifndef _SDL_winrtapp_common_h
-#define _SDL_winrtapp_common_h
+#ifndef SDL_winrtapp_common_h_
+#define SDL_winrtapp_common_h_

 /* A pointer to the app's C-style main() function (which is a different
   function than the WinRT app's actual entry point).
 */
 extern int (*WINRT_SDLAppEntryPoint)(int, char **);

-#endif // ifndef _SDL_winrtapp_common_h
+#endif // SDL_winrtapp_common_h_
@@ -20,8 +20,8 @@
 */
 #include "SDL_config.h"

-#ifndef _SDL_winrtapp_xaml_h
-#define _SDL_winrtapp_xaml_h
+#ifndef SDL_winrtapp_xaml_h_
+#define SDL_winrtapp_xaml_h_

 #include "SDL_stdinc.h"

@@ -30,4 +30,4 @@ extern SDL_bool WINRT_XAMLWasEnabled;
 extern int SDL_WinRTInitXAMLApp(int (*mainFunction)(int, char **), void * backgroundPanelAsIInspectable);
 #endif // ifdef __cplusplus

-#endif // ifndef _SDL_winrtapp_xaml_h
+#endif // SDL_winrtapp_xaml_h_
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_windowshaptic_c_h
-#define _SDL_windowshaptic_c_h
+#ifndef SDL_windowshaptic_c_h_
+#define SDL_windowshaptic_c_h_

 #include "SDL_thread.h"
 #include "../SDL_syshaptic.h"
@@ -82,7 +82,7 @@ extern SDL_hapticlist_item *SDL_hapticlist;
 extern int SDL_SYS_AddHapticDevice(SDL_hapticlist_item *item);
 extern int SDL_SYS_RemoveHapticDevice(SDL_hapticlist_item *prev, SDL_hapticlist_item *item);

-#endif /* _SDL_windowshaptic_c_h */
+#endif /* SDL_windowshaptic_c_h_ */

 /* vi: set ts=4 sw=4 expandtab: */

@@ -23,8 +23,8 @@

 #ifdef SDL_JOYSTICK_ANDROID

-#ifndef _SDL_sysjoystick_c_h
-#define _SDL_sysjoystick_c_h
+#ifndef SDL_sysjoystick_c_h_
+#define SDL_sysjoystick_c_h_

 #include "../SDL_sysjoystick.h"

@@ -51,7 +51,7 @@ typedef struct SDL_joylist_item

 typedef SDL_joylist_item joystick_hwdata;

-#endif /* _SDL_sysjoystick_c_h */
+#endif /* SDL_sysjoystick_c_h_ */

 #endif /* SDL_JOYSTICK_ANDROID */

@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_systhread_c_h
-#define _SDL_systhread_c_h
+#ifndef SDL_systhread_c_h_
+#define SDL_systhread_c_h_

 #include "../../core/windows/SDL_windows.h"

 typedef HANDLE SYS_ThreadHandle;

-#endif /* _SDL_systhread_c_h */
+#endif /* SDL_systhread_c_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_androidclipboard_h
-#define _SDL_androidclipboard_h
+#ifndef SDL_androidclipboard_h_
+#define SDL_androidclipboard_h_

 extern int Android_SetClipboardText(_THIS, const char *text);
 extern char *Android_GetClipboardText(_THIS);
 extern SDL_bool Android_HasClipboardText(_THIS);

-#endif /* _SDL_androidclipboard_h */
+#endif /* SDL_androidclipboard_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_androidgl_h
-#define _SDL_androidgl_h
+#ifndef SDL_androidgl_h_
+#define SDL_androidgl_h_

 SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window);
 int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
@@ -29,6 +29,6 @@ int Android_GLES_SwapWindow(_THIS, SDL_Window * window);
 int Android_GLES_LoadLibrary(_THIS, const char *path);


-#endif /* _SDL_androidgl_h */
+#endif /* SDL_androidgl_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -19,14 +19,14 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_androidmouse_h
-#define _SDL_androidmouse_h
+#ifndef SDL_androidmouse_h_
+#define SDL_androidmouse_h_

 #include "SDL_androidvideo.h"

 extern void Android_InitMouse(void);
 extern void Android_OnMouse( int button, int action, float x, float y);

-#endif /* _SDL_androidmouse_h */
+#endif /* SDL_androidmouse_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_androidvideo_h
-#define _SDL_androidvideo_h
+#ifndef SDL_androidvideo_h_
+#define SDL_androidvideo_h_

 #include "SDL_mutex.h"
 #include "SDL_rect.h"
@@ -44,6 +44,6 @@ extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
 extern SDL_Window *Android_Window;


-#endif /* _SDL_androidvideo_h */
+#endif /* SDL_androidvideo_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -26,8 +26,8 @@

 #include "../../SDL_internal.h"

-#ifndef _SDL_androidvulkan_h
-#define _SDL_androidvulkan_h
+#ifndef SDL_androidvulkan_h_
+#define SDL_androidvulkan_h_

 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -47,6 +47,6 @@ SDL_bool Android_Vulkan_CreateSurface(_THIS,

 #endif

-#endif /* _SDL_androidvulkan_h */
+#endif /* SDL_androidvulkan_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_androidwindow_h
-#define _SDL_androidwindow_h
+#ifndef SDL_androidwindow_h_
+#define SDL_androidwindow_h_

 #include "../../core/android/SDL_android.h"
 #include "../SDL_egl_c.h"
@@ -39,6 +39,6 @@ typedef struct
    
 } SDL_WindowData;

-#endif /* _SDL_androidwindow_h */
+#endif /* SDL_androidwindow_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoaclipboard_h
-#define _SDL_cocoaclipboard_h
+#ifndef SDL_cocoaclipboard_h_
+#define SDL_cocoaclipboard_h_

 /* Forward declaration */
 struct SDL_VideoData;
@@ -31,6 +31,6 @@ extern char *Cocoa_GetClipboardText(_THIS);
 extern SDL_bool Cocoa_HasClipboardText(_THIS);
 extern void Cocoa_CheckClipboardUpdate(struct SDL_VideoData * data);

-#endif /* _SDL_cocoaclipboard_h */
+#endif /* SDL_cocoaclipboard_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoaevents_h
-#define _SDL_cocoaevents_h
+#ifndef SDL_cocoaevents_h_
+#define SDL_cocoaevents_h_

 extern void Cocoa_RegisterApp(void);
 extern void Cocoa_PumpEvents(_THIS);
 extern void Cocoa_SuspendScreenSaver(_THIS);

-#endif /* _SDL_cocoaevents_h */
+#endif /* SDL_cocoaevents_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoakeyboard_h
-#define _SDL_cocoakeyboard_h
+#ifndef SDL_cocoakeyboard_h_
+#define SDL_cocoakeyboard_h_

 extern void Cocoa_InitKeyboard(_THIS);
 extern void Cocoa_HandleKeyEvent(_THIS, NSEvent * event);
@@ -31,6 +31,6 @@ extern void Cocoa_StartTextInput(_THIS);
 extern void Cocoa_StopTextInput(_THIS);
 extern void Cocoa_SetTextInputRect(_THIS, SDL_Rect *rect);

-#endif /* _SDL_cocoakeyboard_h */
+#endif /* SDL_cocoakeyboard_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -26,8 +26,8 @@
 * how to add a CAMetalLayer backed view.
 */

-#ifndef _SDL_cocoametalview_h
-#define _SDL_cocoametalview_h
+#ifndef SDL_cocoametalview_h_
+#define SDL_cocoametalview_h_

 #import "../SDL_sysvideo.h"
 #import "SDL_cocoawindow.h"
@@ -55,7 +55,7 @@ SDL_cocoametalview* Cocoa_Mtl_AddMetalView(SDL_Window* window);

 void Cocoa_Mtl_GetDrawableSize(SDL_Window * window, int * w, int * h);

-#endif /* _SDL_cocoametalview_h */
+#endif /* SDL_cocoametalview_h_ */

 /* vi: set ts=4 sw=4 expandtab: */

@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoamodes_h
-#define _SDL_cocoamodes_h
+#ifndef SDL_cocoamodes_h_
+#define SDL_cocoamodes_h_

 typedef struct
 {
@@ -41,6 +41,6 @@ extern int Cocoa_GetDisplayDPI(_THIS, SDL_VideoDisplay * display, float * ddpi,
 extern int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
 extern void Cocoa_QuitModes(_THIS);

-#endif /* _SDL_cocoamodes_h */
+#endif /* SDL_cocoamodes_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoamouse_h
-#define _SDL_cocoamouse_h
+#ifndef SDL_cocoamouse_h_
+#define SDL_cocoamouse_h_

 #include "SDL_cocoavideo.h"

@@ -47,6 +47,6 @@ typedef struct {
 + (NSCursor *)invisibleCursor;
@end

-#endif /* _SDL_cocoamouse_h */
+#endif /* SDL_cocoamouse_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoamousetap_h
-#define _SDL_cocoamousetap_h
+#ifndef SDL_cocoamousetap_h_
+#define SDL_cocoamousetap_h_

 #include "SDL_cocoamouse.h"

@@ -29,6 +29,6 @@ extern void Cocoa_InitMouseEventTap(SDL_MouseData *driverdata);
 extern void Cocoa_EnableMouseEventTap(SDL_MouseData *driverdata, SDL_bool enabled);
 extern void Cocoa_QuitMouseEventTap(SDL_MouseData *driverdata);

-#endif /* _SDL_cocoamousetap_h */
+#endif /* SDL_cocoamousetap_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoaopengl_h
-#define _SDL_cocoaopengl_h
+#ifndef SDL_cocoaopengl_h_
+#define SDL_cocoaopengl_h_

 #if SDL_VIDEO_OPENGL_CGL

@@ -63,6 +63,6 @@ extern void Cocoa_GL_DeleteContext(_THIS, SDL_GLContext context);

 #endif /* SDL_VIDEO_OPENGL_CGL */

-#endif /* _SDL_cocoaopengl_h */
+#endif /* SDL_cocoaopengl_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -21,8 +21,8 @@

 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoashape_h
-#define _SDL_cocoashape_h
+#ifndef SDL_cocoashape_h_
+#define SDL_cocoashape_h_

 #include "SDL_stdinc.h"
 #include "SDL_video.h"
@@ -40,4 +40,6 @@ extern SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window);
 extern int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
 extern int Cocoa_ResizeWindowShape(SDL_Window *window);

-#endif
+#endif /* SDL_cocoashape_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoavideo_h
-#define _SDL_cocoavideo_h
+#ifndef SDL_cocoavideo_h_
+#define SDL_cocoavideo_h_

 #include "SDL_opengl.h"

@@ -113,6 +113,6 @@ typedef struct SDL_VideoData
 /* Utility functions */
 extern NSImage * Cocoa_CreateImage(SDL_Surface * surface);

-#endif /* _SDL_cocoavideo_h */
+#endif /* SDL_cocoavideo_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -27,8 +27,8 @@

 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoavulkan_h
-#define _SDL_cocoavulkan_h
+#ifndef SDL_cocoavulkan_h_
+#define SDL_cocoavulkan_h_

 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -50,6 +50,6 @@ void Cocoa_Vulkan_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h);

 #endif

-#endif /* _SDL_cocoavulkan_h */
+#endif /* SDL_cocoavulkan_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_cocoawindow_h
-#define _SDL_cocoawindow_h
+#ifndef SDL_cocoawindow_h_
+#define SDL_cocoawindow_h_

 #import <Cocoa/Cocoa.h>

@@ -142,6 +142,6 @@ extern void Cocoa_DestroyWindow(_THIS, SDL_Window * window);
 extern SDL_bool Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info);
 extern int Cocoa_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);

-#endif /* _SDL_cocoawindow_h */
+#endif /* SDL_cocoawindow_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -19,8 +19,8 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_directfb_wm_h
-#define _SDL_directfb_wm_h
+#ifndef SDL_directfb_wm_h_
+#define SDL_directfb_wm_h_

 #include "SDL_DirectFB_video.h"

@@ -51,6 +51,6 @@ extern DFBResult DirectFB_WM_GetClientSize(_THIS, SDL_Window * window,
                                           int *cw, int *ch);


-#endif /* _SDL_directfb_wm_h */
+#endif /* SDL_directfb_wm_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -19,8 +19,8 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_DirectFB_dyn_h
-#define _SDL_DirectFB_dyn_h
+#ifndef SDL_DirectFB_dyn_h_
+#define SDL_DirectFB_dyn_h_

 #define DFB_SYMS \
    DFB_SYM(DFBResult, DirectFBError, (const char *msg, DFBResult result), (msg, result), return) \
@@ -36,4 +36,6 @@
 int SDL_DirectFB_LoadLibrary(void);
 void SDL_DirectFB_UnLoadLibrary(void);

-#endif
+#endif /* SDL_DirectFB_dyn_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
@@ -19,8 +19,8 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_DirectFB_events_h
-#define _SDL_DirectFB_events_h
+#ifndef SDL_DirectFB_events_h_
+#define SDL_DirectFB_events_h_

 #include "../SDL_sysvideo.h"

@@ -29,4 +29,6 @@ extern void DirectFB_InitKeyboard(_THIS);
 extern void DirectFB_QuitKeyboard(_THIS);
 extern void DirectFB_PumpEventsWindow(_THIS);

-#endif
+#endif /* SDL_DirectFB_events_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
@@ -19,8 +19,8 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_directfb_modes_h
-#define _SDL_directfb_modes_h
+#ifndef SDL_directfb_modes_h_
+#define SDL_directfb_modes_h_

 #include <directfb.h>

@@ -54,6 +54,6 @@ extern void DirectFB_QuitModes(_THIS);

 extern void DirectFB_SetContext(_THIS, SDL_Window *window);

-#endif /* _SDL_directfb_modes_h */
+#endif /* SDL_directfb_modes_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -19,8 +19,8 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_DirectFB_mouse_h
-#define _SDL_DirectFB_mouse_h
+#ifndef SDL_DirectFB_mouse_h_
+#define SDL_DirectFB_mouse_h_

 #include <directfb.h>

@@ -39,6 +39,6 @@ struct _DFB_CursorData
 extern void DirectFB_InitMouse(_THIS);
 extern void DirectFB_QuitMouse(_THIS);

-#endif /* _SDL_DirectFB_mouse_h */
+#endif /* SDL_DirectFB_mouse_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -20,8 +20,8 @@
 */


-#ifndef _SDL_directfb_opengl_h
-#define _SDL_directfb_opengl_h
+#ifndef SDL_directfb_opengl_h_
+#define SDL_directfb_opengl_h_

 #include "SDL_DirectFB_video.h"

@@ -59,6 +59,6 @@ extern void DirectFB_GL_DestroyWindowContexts(_THIS, SDL_Window * window);

 #endif /* SDL_DIRECTFB_OPENGL */

-#endif /* _SDL_directfb_opengl_h */
+#endif /* SDL_directfb_opengl_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -19,8 +19,8 @@
  3. This notice may not be removed or altered from any source distribution.
 */

-#ifndef _SDL_DirectFB_shape_h
-#define _SDL_DirectFB_shape_h
+#ifndef SDL_DirectFB_shape_h_
+#define SDL_DirectFB_shape_h_

 #include <directfb.h>

@@ -35,4 +35,4 @@ extern SDL_WindowShaper* DirectFB_CreateShaper(SDL_Window* window);
 extern int DirectFB_ResizeWindowShape(SDL_Window* window);
 extern int DirectFB_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode);

-#endif /* _SDL_DirectFB_shape_h */
+#endif /* SDL_DirectFB_shape_h_ */
@@ -21,8 +21,8 @@

 #include "../../SDL_internal.h"

-#ifndef _SDL_DirectFB_video_h
-#define _SDL_DirectFB_video_h
+#ifndef SDL_DirectFB_video_h_
+#define SDL_DirectFB_video_h_

 #include <directfb.h>
 #include <directfb_version.h>
@@ -167,4 +167,4 @@ DFBSurfacePixelFormat DirectFB_SDLToDFBPixelFormat(Uint32 format);
 void DirectFB_SetSupportedPixelFormats(SDL_RendererInfo *ri);


-#endif /* _SDL_DirectFB_video_h */
+#endif /* SDL_DirectFB_video_h_ */
--- a/Show More
+++ b/Show More