Renaming of guard header names to quiet -Wreserved-id-macro
authorSam Lantinga <slouken@libsdl.org>
Sun, 20 Nov 2016 21:34:54 -0800
changeset 10638d11daa346140
parent 10637 5e3ac176d5a8
child 10639 de933c5f3859
Renaming of guard header names to quiet -Wreserved-id-macro
Patch contributed by Sylvain
include/SDL.h
include/SDL_assert.h
include/SDL_atomic.h
include/SDL_audio.h
include/SDL_bits.h
include/SDL_blendmode.h
include/SDL_clipboard.h
include/SDL_config.h
include/SDL_config.h.cmake
include/SDL_config.h.in
include/SDL_config_android.h
include/SDL_config_iphoneos.h
include/SDL_config_macosx.h
include/SDL_config_minimal.h
include/SDL_config_pandora.h
include/SDL_config_psp.h
include/SDL_config_windows.h
include/SDL_config_winrt.h
include/SDL_config_wiz.h
include/SDL_cpuinfo.h
include/SDL_endian.h
include/SDL_error.h
include/SDL_events.h
include/SDL_filesystem.h
include/SDL_gamecontroller.h
include/SDL_gesture.h
include/SDL_haptic.h
include/SDL_hints.h
include/SDL_joystick.h
include/SDL_keyboard.h
include/SDL_keycode.h
include/SDL_loadso.h
include/SDL_log.h
include/SDL_main.h
include/SDL_messagebox.h
include/SDL_mouse.h
include/SDL_mutex.h
include/SDL_name.h
include/SDL_opengl.h
include/SDL_pixels.h
include/SDL_platform.h
include/SDL_power.h
include/SDL_quit.h
include/SDL_rect.h
include/SDL_render.h
include/SDL_rwops.h
include/SDL_scancode.h
include/SDL_shape.h
include/SDL_stdinc.h
include/SDL_surface.h
include/SDL_system.h
include/SDL_syswm.h
include/SDL_test.h
include/SDL_test_assert.h
include/SDL_test_common.h
include/SDL_test_compare.h
include/SDL_test_crc32.h
include/SDL_test_font.h
include/SDL_test_fuzzer.h
include/SDL_test_harness.h
include/SDL_test_images.h
include/SDL_test_log.h
include/SDL_test_md5.h
include/SDL_test_random.h
include/SDL_thread.h
include/SDL_timer.h
include/SDL_touch.h
include/SDL_version.h
include/SDL_video.h
src/SDL_error_c.h
src/SDL_internal.h
src/audio/SDL_sysaudio.h
src/audio/alsa/SDL_alsa_audio.h
src/audio/disk/SDL_diskaudio.h
src/audio/dsp/SDL_dspaudio.h
src/audio/dummy/SDL_dummyaudio.h
src/audio/nas/SDL_nasaudio.h
src/audio/pulseaudio/SDL_pulseaudio.h
src/core/linux/SDL_dbus.h
src/core/linux/SDL_evdev.h
src/core/linux/SDL_fcitx.h
src/core/linux/SDL_ibus.h
src/core/linux/SDL_ime.h
src/core/linux/SDL_udev.h
src/dynapi/SDL_dynapi.h
src/events/SDL_clipboardevents_c.h
src/events/SDL_dropevents_c.h
src/events/SDL_gesture_c.h
src/events/SDL_keyboard_c.h
src/events/SDL_mouse_c.h
src/events/SDL_touch_c.h
src/events/SDL_windowevents_c.h
src/haptic/SDL_syshaptic.h
src/joystick/SDL_sysjoystick.h
src/power/SDL_syspower.h
src/render/SDL_sysrender.h
src/thread/SDL_systhread.h
src/thread/SDL_thread_c.h
src/thread/pthread/SDL_sysmutex_c.h
src/video/SDL_blit.h
src/video/SDL_egl_c.h
src/video/SDL_shape_internals.h
src/video/SDL_sysvideo.h
src/video/dummy/SDL_nullvideo.h
src/video/x11/SDL_x11clipboard.h
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11events.h
src/video/x11/SDL_x11keyboard.h
src/video/x11/SDL_x11modes.h
src/video/x11/SDL_x11mouse.h
src/video/x11/SDL_x11opengl.h
src/video/x11/SDL_x11opengles.h
src/video/x11/SDL_x11shape.h
src/video/x11/SDL_x11touch.h
src/video/x11/SDL_x11video.h
src/video/x11/SDL_x11window.h
src/video/x11/SDL_x11xinput2.h
     1.1 --- a/include/SDL.h	Sun Nov 20 21:29:27 2016 -0800
     1.2 +++ b/include/SDL.h	Sun Nov 20 21:34:54 2016 -0800
     1.3 @@ -26,8 +26,8 @@
     1.4   */
     1.5  
     1.6  
     1.7 -#ifndef _SDL_H
     1.8 -#define _SDL_H
     1.9 +#ifndef SDL_h_
    1.10 +#define SDL_h_
    1.11  
    1.12  #include "SDL_main.h"
    1.13  #include "SDL_stdinc.h"
    1.14 @@ -127,6 +127,6 @@
    1.15  #endif
    1.16  #include "close_code.h"
    1.17  
    1.18 -#endif /* _SDL_H */
    1.19 +#endif /* SDL_h_ */
    1.20  
    1.21  /* vi: set ts=4 sw=4 expandtab: */
     2.1 --- a/include/SDL_assert.h	Sun Nov 20 21:29:27 2016 -0800
     2.2 +++ b/include/SDL_assert.h	Sun Nov 20 21:34:54 2016 -0800
     2.3 @@ -19,8 +19,8 @@
     2.4    3. This notice may not be removed or altered from any source distribution.
     2.5  */
     2.6  
     2.7 -#ifndef _SDL_assert_h
     2.8 -#define _SDL_assert_h
     2.9 +#ifndef SDL_assert_h_
    2.10 +#define SDL_assert_h_
    2.11  
    2.12  #include "SDL_config.h"
    2.13  
    2.14 @@ -284,6 +284,6 @@
    2.15  #endif
    2.16  #include "close_code.h"
    2.17  
    2.18 -#endif /* _SDL_assert_h */
    2.19 +#endif /* SDL_assert_h_ */
    2.20  
    2.21  /* vi: set ts=4 sw=4 expandtab: */
     3.1 --- a/include/SDL_atomic.h	Sun Nov 20 21:29:27 2016 -0800
     3.2 +++ b/include/SDL_atomic.h	Sun Nov 20 21:34:54 2016 -0800
     3.3 @@ -56,8 +56,8 @@
     3.4   * All of the atomic operations that modify memory are full memory barriers.
     3.5   */
     3.6  
     3.7 -#ifndef _SDL_atomic_h_
     3.8 -#define _SDL_atomic_h_
     3.9 +#ifndef SDL_atomic_h_
    3.10 +#define SDL_atomic_h_
    3.11  
    3.12  #include "SDL_stdinc.h"
    3.13  #include "SDL_platform.h"
    3.14 @@ -263,6 +263,6 @@
    3.15  
    3.16  #include "close_code.h"
    3.17  
    3.18 -#endif /* _SDL_atomic_h_ */
    3.19 +#endif /* SDL_atomic_h_ */
    3.20  
    3.21  /* vi: set ts=4 sw=4 expandtab: */
     4.1 --- a/include/SDL_audio.h	Sun Nov 20 21:29:27 2016 -0800
     4.2 +++ b/include/SDL_audio.h	Sun Nov 20 21:34:54 2016 -0800
     4.3 @@ -25,8 +25,8 @@
     4.4   *  Access to the raw audio mixing buffer for the SDL library.
     4.5   */
     4.6  
     4.7 -#ifndef _SDL_audio_h
     4.8 -#define _SDL_audio_h
     4.9 +#ifndef SDL_audio_h_
    4.10 +#define SDL_audio_h_
    4.11  
    4.12  #include "SDL_stdinc.h"
    4.13  #include "SDL_error.h"
    4.14 @@ -667,6 +667,6 @@
    4.15  #endif
    4.16  #include "close_code.h"
    4.17  
    4.18 -#endif /* _SDL_audio_h */
    4.19 +#endif /* SDL_audio_h_ */
    4.20  
    4.21  /* vi: set ts=4 sw=4 expandtab: */
     5.1 --- a/include/SDL_bits.h	Sun Nov 20 21:29:27 2016 -0800
     5.2 +++ b/include/SDL_bits.h	Sun Nov 20 21:34:54 2016 -0800
     5.3 @@ -25,8 +25,8 @@
     5.4   *  Functions for fiddling with bits and bitmasks.
     5.5   */
     5.6  
     5.7 -#ifndef _SDL_bits_h
     5.8 -#define _SDL_bits_h
     5.9 +#ifndef SDL_bits_h_
    5.10 +#define SDL_bits_h_
    5.11  
    5.12  #include "SDL_stdinc.h"
    5.13  
    5.14 @@ -92,6 +92,6 @@
    5.15  #endif
    5.16  #include "close_code.h"
    5.17  
    5.18 -#endif /* _SDL_bits_h */
    5.19 +#endif /* SDL_bits_h_ */
    5.20  
    5.21  /* vi: set ts=4 sw=4 expandtab: */
     6.1 --- a/include/SDL_blendmode.h	Sun Nov 20 21:29:27 2016 -0800
     6.2 +++ b/include/SDL_blendmode.h	Sun Nov 20 21:34:54 2016 -0800
     6.3 @@ -25,8 +25,8 @@
     6.4   *  Header file declaring the SDL_BlendMode enumeration
     6.5   */
     6.6  
     6.7 -#ifndef _SDL_blendmode_h
     6.8 -#define _SDL_blendmode_h
     6.9 +#ifndef SDL_blendmode_h_
    6.10 +#define SDL_blendmode_h_
    6.11  
    6.12  #include "begin_code.h"
    6.13  /* Set up for C function definitions, even when using C++ */
    6.14 @@ -58,6 +58,6 @@
    6.15  #endif
    6.16  #include "close_code.h"
    6.17  
    6.18 -#endif /* _SDL_blendmode_h */
    6.19 +#endif /* SDL_blendmode_h_ */
    6.20  
    6.21  /* vi: set ts=4 sw=4 expandtab: */
     7.1 --- a/include/SDL_clipboard.h	Sun Nov 20 21:29:27 2016 -0800
     7.2 +++ b/include/SDL_clipboard.h	Sun Nov 20 21:34:54 2016 -0800
     7.3 @@ -25,8 +25,8 @@
     7.4   * Include file for SDL clipboard handling
     7.5   */
     7.6  
     7.7 -#ifndef _SDL_clipboard_h
     7.8 -#define _SDL_clipboard_h
     7.9 +#ifndef SDL_clipboard_h_
    7.10 +#define SDL_clipboard_h_
    7.11  
    7.12  #include "SDL_stdinc.h"
    7.13  
    7.14 @@ -66,6 +66,6 @@
    7.15  #endif
    7.16  #include "close_code.h"
    7.17  
    7.18 -#endif /* _SDL_clipboard_h */
    7.19 +#endif /* SDL_clipboard_h_ */
    7.20  
    7.21  /* vi: set ts=4 sw=4 expandtab: */
     8.1 --- a/include/SDL_config.h	Sun Nov 20 21:29:27 2016 -0800
     8.2 +++ b/include/SDL_config.h	Sun Nov 20 21:34:54 2016 -0800
     8.3 @@ -19,8 +19,8 @@
     8.4    3. This notice may not be removed or altered from any source distribution.
     8.5  */
     8.6  
     8.7 -#ifndef _SDL_config_h
     8.8 -#define _SDL_config_h
     8.9 +#ifndef SDL_config_h_
    8.10 +#define SDL_config_h_
    8.11  
    8.12  #include "SDL_platform.h"
    8.13  
    8.14 @@ -50,4 +50,4 @@
    8.15  #error Wrong SDL_config.h, check your include path?
    8.16  #endif
    8.17  
    8.18 -#endif /* _SDL_config_h */
    8.19 +#endif /* SDL_config_h_ */
     9.1 --- a/include/SDL_config.h.cmake	Sun Nov 20 21:29:27 2016 -0800
     9.2 +++ b/include/SDL_config.h.cmake	Sun Nov 20 21:34:54 2016 -0800
     9.3 @@ -19,8 +19,8 @@
     9.4    3. This notice may not be removed or altered from any source distribution.
     9.5  */
     9.6  
     9.7 -#ifndef _SDL_config_h
     9.8 -#define _SDL_config_h
     9.9 +#ifndef SDL_config_h_
    9.10 +#define SDL_config_h_
    9.11  
    9.12  /**
    9.13   *  \file SDL_config.h.in
    9.14 @@ -419,4 +419,4 @@
    9.15  #  endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    9.16  #endif /* __WIN32__ */
    9.17  
    9.18 -#endif /* _SDL_config_h */
    9.19 +#endif /* SDL_config_h_ */
    10.1 --- a/include/SDL_config.h.in	Sun Nov 20 21:29:27 2016 -0800
    10.2 +++ b/include/SDL_config.h.in	Sun Nov 20 21:34:54 2016 -0800
    10.3 @@ -19,8 +19,8 @@
    10.4    3. This notice may not be removed or altered from any source distribution.
    10.5  */
    10.6  
    10.7 -#ifndef _SDL_config_h
    10.8 -#define _SDL_config_h
    10.9 +#ifndef SDL_config_h_
   10.10 +#define SDL_config_h_
   10.11  
   10.12  /**
   10.13   *  \file SDL_config.h.in
   10.14 @@ -360,4 +360,4 @@
   10.15  /* Enable ime support */
   10.16  #undef SDL_USE_IME
   10.17  
   10.18 -#endif /* _SDL_config_h */
   10.19 +#endif /* SDL_config_h_ */
    11.1 --- a/include/SDL_config_android.h	Sun Nov 20 21:29:27 2016 -0800
    11.2 +++ b/include/SDL_config_android.h	Sun Nov 20 21:34:54 2016 -0800
    11.3 @@ -19,8 +19,8 @@
    11.4    3. This notice may not be removed or altered from any source distribution.
    11.5  */
    11.6  
    11.7 -#ifndef _SDL_config_android_h
    11.8 -#define _SDL_config_android_h
    11.9 +#ifndef SDL_config_android_h_
   11.10 +#define SDL_config_android_h_
   11.11  
   11.12  #include "SDL_platform.h"
   11.13  
   11.14 @@ -145,4 +145,4 @@
   11.15  /* Enable the filesystem driver */
   11.16  #define SDL_FILESYSTEM_ANDROID   1
   11.17  
   11.18 -#endif /* _SDL_config_android_h */
   11.19 +#endif /* SDL_config_android_h_ */
    12.1 --- a/include/SDL_config_iphoneos.h	Sun Nov 20 21:29:27 2016 -0800
    12.2 +++ b/include/SDL_config_iphoneos.h	Sun Nov 20 21:34:54 2016 -0800
    12.3 @@ -19,8 +19,8 @@
    12.4    3. This notice may not be removed or altered from any source distribution.
    12.5  */
    12.6  
    12.7 -#ifndef _SDL_config_iphoneos_h
    12.8 -#define _SDL_config_iphoneos_h
    12.9 +#ifndef SDL_config_iphoneos_h_
   12.10 +#define SDL_config_iphoneos_h_
   12.11  
   12.12  #include "SDL_platform.h"
   12.13  
   12.14 @@ -155,4 +155,4 @@
   12.15  /* enable filesystem support */
   12.16  #define SDL_FILESYSTEM_COCOA   1
   12.17  
   12.18 -#endif /* _SDL_config_iphoneos_h */
   12.19 +#endif /* SDL_config_iphoneos_h_ */
    13.1 --- a/include/SDL_config_macosx.h	Sun Nov 20 21:29:27 2016 -0800
    13.2 +++ b/include/SDL_config_macosx.h	Sun Nov 20 21:34:54 2016 -0800
    13.3 @@ -19,8 +19,8 @@
    13.4    3. This notice may not be removed or altered from any source distribution.
    13.5  */
    13.6  
    13.7 -#ifndef _SDL_config_macosx_h
    13.8 -#define _SDL_config_macosx_h
    13.9 +#ifndef SDL_config_macosx_h_
   13.10 +#define SDL_config_macosx_h_
   13.11  
   13.12  #include "SDL_platform.h"
   13.13  
   13.14 @@ -185,4 +185,4 @@
   13.15  #define SDL_ALTIVEC_BLITTERS    1
   13.16  #endif
   13.17  
   13.18 -#endif /* _SDL_config_macosx_h */
   13.19 +#endif /* SDL_config_macosx_h_ */
    14.1 --- a/include/SDL_config_minimal.h	Sun Nov 20 21:29:27 2016 -0800
    14.2 +++ b/include/SDL_config_minimal.h	Sun Nov 20 21:34:54 2016 -0800
    14.3 @@ -19,8 +19,8 @@
    14.4    3. This notice may not be removed or altered from any source distribution.
    14.5  */
    14.6  
    14.7 -#ifndef _SDL_config_minimal_h
    14.8 -#define _SDL_config_minimal_h
    14.9 +#ifndef SDL_config_minimal_h_
   14.10 +#define SDL_config_minimal_h_
   14.11  
   14.12  #include "SDL_platform.h"
   14.13  
   14.14 @@ -78,4 +78,4 @@
   14.15  /* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */
   14.16  #define SDL_FILESYSTEM_DUMMY  1
   14.17  
   14.18 -#endif /* _SDL_config_minimal_h */
   14.19 +#endif /* SDL_config_minimal_h_ */
    15.1 --- a/include/SDL_config_pandora.h	Sun Nov 20 21:29:27 2016 -0800
    15.2 +++ b/include/SDL_config_pandora.h	Sun Nov 20 21:34:54 2016 -0800
    15.3 @@ -19,8 +19,8 @@
    15.4    3. This notice may not be removed or altered from any source distribution.
    15.5  */
    15.6  
    15.7 -#ifndef _SDL_config_h
    15.8 -#define _SDL_config_h
    15.9 +#ifndef SDL_config_h_
   15.10 +#define SDL_config_h_
   15.11  
   15.12  /* This is a set of defines to configure the SDL features */
   15.13  
   15.14 @@ -124,4 +124,4 @@
   15.15  #define SDL_VIDEO_RENDER_OGL_ES 1
   15.16  #define SDL_VIDEO_OPENGL_ES 1
   15.17  
   15.18 -#endif /* _SDL_config_h */
   15.19 +#endif /* SDL_config_h_ */
    16.1 --- a/include/SDL_config_psp.h	Sun Nov 20 21:29:27 2016 -0800
    16.2 +++ b/include/SDL_config_psp.h	Sun Nov 20 21:34:54 2016 -0800
    16.3 @@ -19,8 +19,8 @@
    16.4    3. This notice may not be removed or altered from any source distribution.
    16.5  */
    16.6  
    16.7 -#ifndef _SDL_config_psp_h
    16.8 -#define _SDL_config_psp_h
    16.9 +#ifndef SDL_config_psp_h_
   16.10 +#define SDL_config_psp_h_
   16.11  
   16.12  #include "SDL_platform.h"
   16.13  
   16.14 @@ -140,4 +140,4 @@
   16.15  #define SDL_LOADSO_DISABLED    1
   16.16  
   16.17  
   16.18 -#endif /* _SDL_config_psp_h */
   16.19 +#endif /* SDL_config_psp_h_ */
    17.1 --- a/include/SDL_config_windows.h	Sun Nov 20 21:29:27 2016 -0800
    17.2 +++ b/include/SDL_config_windows.h	Sun Nov 20 21:34:54 2016 -0800
    17.3 @@ -19,8 +19,8 @@
    17.4    3. This notice may not be removed or altered from any source distribution.
    17.5  */
    17.6  
    17.7 -#ifndef _SDL_config_windows_h
    17.8 -#define _SDL_config_windows_h
    17.9 +#ifndef SDL_config_windows_h_
   17.10 +#define SDL_config_windows_h_
   17.11  
   17.12  #include "SDL_platform.h"
   17.13  
   17.14 @@ -218,4 +218,4 @@
   17.15  #define SDL_ASSEMBLY_ROUTINES   1
   17.16  #endif
   17.17  
   17.18 -#endif /* _SDL_config_windows_h */
   17.19 +#endif /* SDL_config_windows_h_ */
    18.1 --- a/include/SDL_config_winrt.h	Sun Nov 20 21:29:27 2016 -0800
    18.2 +++ b/include/SDL_config_winrt.h	Sun Nov 20 21:34:54 2016 -0800
    18.3 @@ -19,8 +19,8 @@
    18.4    3. This notice may not be removed or altered from any source distribution.
    18.5  */
    18.6  
    18.7 -#ifndef _SDL_config_winrt_h
    18.8 -#define _SDL_config_winrt_h
    18.9 +#ifndef SDL_config_winrt_h_
   18.10 +#define SDL_config_winrt_h_
   18.11  
   18.12  #include "SDL_platform.h"
   18.13  
   18.14 @@ -211,4 +211,4 @@
   18.15  #define SDL_ASSEMBLY_ROUTINES	1
   18.16  #endif
   18.17  
   18.18 -#endif /* _SDL_config_winrt_h */
   18.19 +#endif /* SDL_config_winrt_h_ */
    19.1 --- a/include/SDL_config_wiz.h	Sun Nov 20 21:29:27 2016 -0800
    19.2 +++ b/include/SDL_config_wiz.h	Sun Nov 20 21:34:54 2016 -0800
    19.3 @@ -19,8 +19,8 @@
    19.4    3. This notice may not be removed or altered from any source distribution.
    19.5  */
    19.6  
    19.7 -#ifndef _SDL_config_h
    19.8 -#define _SDL_config_h
    19.9 +#ifndef SDL_config_h_
   19.10 +#define SDL_config_h_
   19.11  
   19.12  /* This is a set of defines to configure the SDL features */
   19.13  
   19.14 @@ -117,4 +117,4 @@
   19.15  #define SDL_VIDEO_RENDER_OGL_ES 1
   19.16  #define SDL_VIDEO_OPENGL_ES 1
   19.17  
   19.18 -#endif /* _SDL_config_h */
   19.19 +#endif /* SDL_config_h_ */
    20.1 --- a/include/SDL_cpuinfo.h	Sun Nov 20 21:29:27 2016 -0800
    20.2 +++ b/include/SDL_cpuinfo.h	Sun Nov 20 21:34:54 2016 -0800
    20.3 @@ -25,8 +25,8 @@
    20.4   *  CPU feature detection for SDL.
    20.5   */
    20.6  
    20.7 -#ifndef _SDL_cpuinfo_h
    20.8 -#define _SDL_cpuinfo_h
    20.9 +#ifndef SDL_cpuinfo_h_
   20.10 +#define SDL_cpuinfo_h_
   20.11  
   20.12  #include "SDL_stdinc.h"
   20.13  
   20.14 @@ -161,6 +161,6 @@
   20.15  #endif
   20.16  #include "close_code.h"
   20.17  
   20.18 -#endif /* _SDL_cpuinfo_h */
   20.19 +#endif /* SDL_cpuinfo_h_ */
   20.20  
   20.21  /* vi: set ts=4 sw=4 expandtab: */
    21.1 --- a/include/SDL_endian.h	Sun Nov 20 21:29:27 2016 -0800
    21.2 +++ b/include/SDL_endian.h	Sun Nov 20 21:34:54 2016 -0800
    21.3 @@ -25,8 +25,8 @@
    21.4   *  Functions for reading and writing endian-specific values
    21.5   */
    21.6  
    21.7 -#ifndef _SDL_endian_h
    21.8 -#define _SDL_endian_h
    21.9 +#ifndef SDL_endian_h_
   21.10 +#define SDL_endian_h_
   21.11  
   21.12  #include "SDL_stdinc.h"
   21.13  
   21.14 @@ -234,6 +234,6 @@
   21.15  #endif
   21.16  #include "close_code.h"
   21.17  
   21.18 -#endif /* _SDL_endian_h */
   21.19 +#endif /* SDL_endian_h_ */
   21.20  
   21.21  /* vi: set ts=4 sw=4 expandtab: */
    22.1 --- a/include/SDL_error.h	Sun Nov 20 21:29:27 2016 -0800
    22.2 +++ b/include/SDL_error.h	Sun Nov 20 21:34:54 2016 -0800
    22.3 @@ -25,8 +25,8 @@
    22.4   *  Simple error message routines for SDL.
    22.5   */
    22.6  
    22.7 -#ifndef _SDL_error_h
    22.8 -#define _SDL_error_h
    22.9 +#ifndef SDL_error_h_
   22.10 +#define SDL_error_h_
   22.11  
   22.12  #include "SDL_stdinc.h"
   22.13  
   22.14 @@ -71,6 +71,6 @@
   22.15  #endif
   22.16  #include "close_code.h"
   22.17  
   22.18 -#endif /* _SDL_error_h */
   22.19 +#endif /* SDL_error_h_ */
   22.20  
   22.21  /* vi: set ts=4 sw=4 expandtab: */
    23.1 --- a/include/SDL_events.h	Sun Nov 20 21:29:27 2016 -0800
    23.2 +++ b/include/SDL_events.h	Sun Nov 20 21:34:54 2016 -0800
    23.3 @@ -25,8 +25,8 @@
    23.4   *  Include file for SDL event handling.
    23.5   */
    23.6  
    23.7 -#ifndef _SDL_events_h
    23.8 -#define _SDL_events_h
    23.9 +#ifndef SDL_events_h_
   23.10 +#define SDL_events_h_
   23.11  
   23.12  #include "SDL_stdinc.h"
   23.13  #include "SDL_error.h"
   23.14 @@ -749,6 +749,6 @@
   23.15  #endif
   23.16  #include "close_code.h"
   23.17  
   23.18 -#endif /* _SDL_events_h */
   23.19 +#endif /* SDL_events_h_ */
   23.20  
   23.21  /* vi: set ts=4 sw=4 expandtab: */
    24.1 --- a/include/SDL_filesystem.h	Sun Nov 20 21:29:27 2016 -0800
    24.2 +++ b/include/SDL_filesystem.h	Sun Nov 20 21:34:54 2016 -0800
    24.3 @@ -25,8 +25,8 @@
    24.4   *  \brief Include file for filesystem SDL API functions
    24.5   */
    24.6  
    24.7 -#ifndef _SDL_filesystem_h
    24.8 -#define _SDL_filesystem_h
    24.9 +#ifndef SDL_filesystem_h_
   24.10 +#define SDL_filesystem_h_
   24.11  
   24.12  #include "SDL_stdinc.h"
   24.13  
   24.14 @@ -131,6 +131,6 @@
   24.15  #endif
   24.16  #include "close_code.h"
   24.17  
   24.18 -#endif /* _SDL_filesystem_h */
   24.19 +#endif /* SDL_filesystem_h_ */
   24.20  
   24.21  /* vi: set ts=4 sw=4 expandtab: */
    25.1 --- a/include/SDL_gamecontroller.h	Sun Nov 20 21:29:27 2016 -0800
    25.2 +++ b/include/SDL_gamecontroller.h	Sun Nov 20 21:34:54 2016 -0800
    25.3 @@ -25,8 +25,8 @@
    25.4   *  Include file for SDL game controller event handling
    25.5   */
    25.6  
    25.7 -#ifndef _SDL_gamecontroller_h
    25.8 -#define _SDL_gamecontroller_h
    25.9 +#ifndef SDL_gamecontroller_h_
   25.10 +#define SDL_gamecontroller_h_
   25.11  
   25.12  #include "SDL_stdinc.h"
   25.13  #include "SDL_error.h"
   25.14 @@ -337,6 +337,6 @@
   25.15  #endif
   25.16  #include "close_code.h"
   25.17  
   25.18 -#endif /* _SDL_gamecontroller_h */
   25.19 +#endif /* SDL_gamecontroller_h_ */
   25.20  
   25.21  /* vi: set ts=4 sw=4 expandtab: */
    26.1 --- a/include/SDL_gesture.h	Sun Nov 20 21:29:27 2016 -0800
    26.2 +++ b/include/SDL_gesture.h	Sun Nov 20 21:34:54 2016 -0800
    26.3 @@ -25,8 +25,8 @@
    26.4   *  Include file for SDL gesture event handling.
    26.5   */
    26.6  
    26.7 -#ifndef _SDL_gesture_h
    26.8 -#define _SDL_gesture_h
    26.9 +#ifndef SDL_gesture_h_
   26.10 +#define SDL_gesture_h_
   26.11  
   26.12  #include "SDL_stdinc.h"
   26.13  #include "SDL_error.h"
   26.14 @@ -82,6 +82,6 @@
   26.15  #endif
   26.16  #include "close_code.h"
   26.17  
   26.18 -#endif /* _SDL_gesture_h */
   26.19 +#endif /* SDL_gesture_h_ */
   26.20  
   26.21  /* vi: set ts=4 sw=4 expandtab: */
    27.1 --- a/include/SDL_haptic.h	Sun Nov 20 21:29:27 2016 -0800
    27.2 +++ b/include/SDL_haptic.h	Sun Nov 20 21:34:54 2016 -0800
    27.3 @@ -104,8 +104,8 @@
    27.4   * \endcode
    27.5   */
    27.6  
    27.7 -#ifndef _SDL_haptic_h
    27.8 -#define _SDL_haptic_h
    27.9 +#ifndef SDL_h_aptic_h
   27.10 +#define SDL_h_aptic_h
   27.11  
   27.12  #include "SDL_stdinc.h"
   27.13  #include "SDL_error.h"
   27.14 @@ -1218,6 +1218,6 @@
   27.15  #endif
   27.16  #include "close_code.h"
   27.17  
   27.18 -#endif /* _SDL_haptic_h */
   27.19 +#endif /* SDL_h_aptic_h */
   27.20  
   27.21  /* vi: set ts=4 sw=4 expandtab: */
    28.1 --- a/include/SDL_hints.h	Sun Nov 20 21:29:27 2016 -0800
    28.2 +++ b/include/SDL_hints.h	Sun Nov 20 21:34:54 2016 -0800
    28.3 @@ -36,8 +36,8 @@
    28.4   *  to how they would like the library to work.
    28.5   */
    28.6  
    28.7 -#ifndef _SDL_hints_h
    28.8 -#define _SDL_hints_h
    28.9 +#ifndef SDL_h_ints_h
   28.10 +#define SDL_h_ints_h
   28.11  
   28.12  #include "SDL_stdinc.h"
   28.13  
   28.14 @@ -821,6 +821,6 @@
   28.15  #endif
   28.16  #include "close_code.h"
   28.17  
   28.18 -#endif /* _SDL_hints_h */
   28.19 +#endif /* SDL_h_ints_h */
   28.20  
   28.21  /* vi: set ts=4 sw=4 expandtab: */
    29.1 --- a/include/SDL_joystick.h	Sun Nov 20 21:29:27 2016 -0800
    29.2 +++ b/include/SDL_joystick.h	Sun Nov 20 21:34:54 2016 -0800
    29.3 @@ -36,8 +36,8 @@
    29.4   *
    29.5   */
    29.6  
    29.7 -#ifndef _SDL_joystick_h
    29.8 -#define _SDL_joystick_h
    29.9 +#ifndef SDL_joystick_h_
   29.10 +#define SDL_joystick_h_
   29.11  
   29.12  #include "SDL_stdinc.h"
   29.13  #include "SDL_error.h"
   29.14 @@ -310,6 +310,6 @@
   29.15  #endif
   29.16  #include "close_code.h"
   29.17  
   29.18 -#endif /* _SDL_joystick_h */
   29.19 +#endif /* SDL_joystick_h_ */
   29.20  
   29.21  /* vi: set ts=4 sw=4 expandtab: */
    30.1 --- a/include/SDL_keyboard.h	Sun Nov 20 21:29:27 2016 -0800
    30.2 +++ b/include/SDL_keyboard.h	Sun Nov 20 21:34:54 2016 -0800
    30.3 @@ -25,8 +25,8 @@
    30.4   *  Include file for SDL keyboard event handling
    30.5   */
    30.6  
    30.7 -#ifndef _SDL_keyboard_h
    30.8 -#define _SDL_keyboard_h
    30.9 +#ifndef SDL_keyboard_h_
   30.10 +#define SDL_keyboard_h_
   30.11  
   30.12  #include "SDL_stdinc.h"
   30.13  #include "SDL_error.h"
   30.14 @@ -212,6 +212,6 @@
   30.15  #endif
   30.16  #include "close_code.h"
   30.17  
   30.18 -#endif /* _SDL_keyboard_h */
   30.19 +#endif /* SDL_keyboard_h_ */
   30.20  
   30.21  /* vi: set ts=4 sw=4 expandtab: */
    31.1 --- a/include/SDL_keycode.h	Sun Nov 20 21:29:27 2016 -0800
    31.2 +++ b/include/SDL_keycode.h	Sun Nov 20 21:34:54 2016 -0800
    31.3 @@ -25,8 +25,8 @@
    31.4   *  Defines constants which identify keyboard keys and modifiers.
    31.5   */
    31.6  
    31.7 -#ifndef _SDL_keycode_h
    31.8 -#define _SDL_keycode_h
    31.9 +#ifndef SDL_keycode_h_
   31.10 +#define SDL_keycode_h_
   31.11  
   31.12  #include "SDL_stdinc.h"
   31.13  #include "SDL_scancode.h"
   31.14 @@ -336,6 +336,6 @@
   31.15  #define KMOD_ALT    (KMOD_LALT|KMOD_RALT)
   31.16  #define KMOD_GUI    (KMOD_LGUI|KMOD_RGUI)
   31.17  
   31.18 -#endif /* _SDL_keycode_h */
   31.19 +#endif /* SDL_keycode_h_ */
   31.20  
   31.21  /* vi: set ts=4 sw=4 expandtab: */
    32.1 --- a/include/SDL_loadso.h	Sun Nov 20 21:29:27 2016 -0800
    32.2 +++ b/include/SDL_loadso.h	Sun Nov 20 21:34:54 2016 -0800
    32.3 @@ -38,8 +38,8 @@
    32.4   *      the results you expect. :)
    32.5   */
    32.6  
    32.7 -#ifndef _SDL_loadso_h
    32.8 -#define _SDL_loadso_h
    32.9 +#ifndef SDL_loadso_h_
   32.10 +#define SDL_loadso_h_
   32.11  
   32.12  #include "SDL_stdinc.h"
   32.13  #include "SDL_error.h"
   32.14 @@ -76,6 +76,6 @@
   32.15  #endif
   32.16  #include "close_code.h"
   32.17  
   32.18 -#endif /* _SDL_loadso_h */
   32.19 +#endif /* SDL_loadso_h_ */
   32.20  
   32.21  /* vi: set ts=4 sw=4 expandtab: */
    33.1 --- a/include/SDL_log.h	Sun Nov 20 21:29:27 2016 -0800
    33.2 +++ b/include/SDL_log.h	Sun Nov 20 21:34:54 2016 -0800
    33.3 @@ -34,8 +34,8 @@
    33.4   *      Others: standard error output (stderr)
    33.5   */
    33.6  
    33.7 -#ifndef _SDL_log_h
    33.8 -#define _SDL_log_h
    33.9 +#ifndef SDL_log_h_
   33.10 +#define SDL_log_h_
   33.11  
   33.12  #include "SDL_stdinc.h"
   33.13  
   33.14 @@ -206,6 +206,6 @@
   33.15  #endif
   33.16  #include "close_code.h"
   33.17  
   33.18 -#endif /* _SDL_log_h */
   33.19 +#endif /* SDL_log_h_ */
   33.20  
   33.21  /* vi: set ts=4 sw=4 expandtab: */
    34.1 --- a/include/SDL_main.h	Sun Nov 20 21:29:27 2016 -0800
    34.2 +++ b/include/SDL_main.h	Sun Nov 20 21:34:54 2016 -0800
    34.3 @@ -19,8 +19,8 @@
    34.4    3. This notice may not be removed or altered from any source distribution.
    34.5  */
    34.6  
    34.7 -#ifndef _SDL_main_h
    34.8 -#define _SDL_main_h
    34.9 +#ifndef SDL_main_h_
   34.10 +#define SDL_main_h_
   34.11  
   34.12  #include "SDL_stdinc.h"
   34.13  
   34.14 @@ -156,6 +156,6 @@
   34.15  #endif
   34.16  #include "close_code.h"
   34.17  
   34.18 -#endif /* _SDL_main_h */
   34.19 +#endif /* SDL_main_h_ */
   34.20  
   34.21  /* vi: set ts=4 sw=4 expandtab: */
    35.1 --- a/include/SDL_messagebox.h	Sun Nov 20 21:29:27 2016 -0800
    35.2 +++ b/include/SDL_messagebox.h	Sun Nov 20 21:34:54 2016 -0800
    35.3 @@ -19,8 +19,8 @@
    35.4    3. This notice may not be removed or altered from any source distribution.
    35.5  */
    35.6  
    35.7 -#ifndef _SDL_messagebox_h
    35.8 -#define _SDL_messagebox_h
    35.9 +#ifndef SDL_messagebox_h_
   35.10 +#define SDL_messagebox_h_
   35.11  
   35.12  #include "SDL_stdinc.h"
   35.13  #include "SDL_video.h"      /* For SDL_Window */
   35.14 @@ -139,6 +139,6 @@
   35.15  #endif
   35.16  #include "close_code.h"
   35.17  
   35.18 -#endif /* _SDL_messagebox_h */
   35.19 +#endif /* SDL_messagebox_h_ */
   35.20  
   35.21  /* vi: set ts=4 sw=4 expandtab: */
    36.1 --- a/include/SDL_mouse.h	Sun Nov 20 21:29:27 2016 -0800
    36.2 +++ b/include/SDL_mouse.h	Sun Nov 20 21:34:54 2016 -0800
    36.3 @@ -25,8 +25,8 @@
    36.4   *  Include file for SDL mouse event handling.
    36.5   */
    36.6  
    36.7 -#ifndef _SDL_mouse_h
    36.8 -#define _SDL_mouse_h
    36.9 +#ifndef SDL_mouse_h_
   36.10 +#define SDL_mouse_h_
   36.11  
   36.12  #include "SDL_stdinc.h"
   36.13  #include "SDL_error.h"
   36.14 @@ -297,6 +297,6 @@
   36.15  #endif
   36.16  #include "close_code.h"
   36.17  
   36.18 -#endif /* _SDL_mouse_h */
   36.19 +#endif /* SDL_mouse_h_ */
   36.20  
   36.21  /* vi: set ts=4 sw=4 expandtab: */
    37.1 --- a/include/SDL_mutex.h	Sun Nov 20 21:29:27 2016 -0800
    37.2 +++ b/include/SDL_mutex.h	Sun Nov 20 21:34:54 2016 -0800
    37.3 @@ -19,8 +19,8 @@
    37.4    3. This notice may not be removed or altered from any source distribution.
    37.5  */
    37.6  
    37.7 -#ifndef _SDL_mutex_h
    37.8 -#define _SDL_mutex_h
    37.9 +#ifndef SDL_mutex_h_
   37.10 +#define SDL_mutex_h_
   37.11  
   37.12  /**
   37.13   *  \file SDL_mutex.h
   37.14 @@ -246,6 +246,6 @@
   37.15  #endif
   37.16  #include "close_code.h"
   37.17  
   37.18 -#endif /* _SDL_mutex_h */
   37.19 +#endif /* SDL_mutex_h_ */
   37.20  
   37.21  /* vi: set ts=4 sw=4 expandtab: */
    38.1 --- a/include/SDL_name.h	Sun Nov 20 21:29:27 2016 -0800
    38.2 +++ b/include/SDL_name.h	Sun Nov 20 21:34:54 2016 -0800
    38.3 @@ -19,8 +19,8 @@
    38.4    3. This notice may not be removed or altered from any source distribution.
    38.5  */
    38.6  
    38.7 -#ifndef _SDLname_h_
    38.8 -#define _SDLname_h_
    38.9 +#ifndef SDLname_h_
   38.10 +#define SDLname_h_
   38.11  
   38.12  #if defined(__STDC__) || defined(__cplusplus)
   38.13  #define NeedFunctionPrototypes 1
   38.14 @@ -28,6 +28,6 @@
   38.15  
   38.16  #define SDL_NAME(X) SDL_##X
   38.17  
   38.18 -#endif /* _SDLname_h_ */
   38.19 +#endif /* SDLname_h_ */
   38.20  
   38.21  /* vi: set ts=4 sw=4 expandtab: */
    39.1 --- a/include/SDL_opengl.h	Sun Nov 20 21:29:27 2016 -0800
    39.2 +++ b/include/SDL_opengl.h	Sun Nov 20 21:34:54 2016 -0800
    39.3 @@ -32,8 +32,8 @@
    39.4   *  version included in SDL_opengl.h.
    39.5   */
    39.6  
    39.7 -#ifndef _SDL_opengl_h
    39.8 -#define _SDL_opengl_h
    39.9 +#ifndef SDL_opengl_h_
   39.10 +#define SDL_opengl_h_
   39.11  
   39.12  #include "SDL_config.h"
   39.13  
   39.14 @@ -2171,6 +2171,6 @@
   39.15  
   39.16  #endif /* !__IPHONEOS__ */
   39.17  
   39.18 -#endif /* _SDL_opengl_h */
   39.19 +#endif /* SDL_opengl_h_ */
   39.20  
   39.21  /* vi: set ts=4 sw=4 expandtab: */
    40.1 --- a/include/SDL_pixels.h	Sun Nov 20 21:29:27 2016 -0800
    40.2 +++ b/include/SDL_pixels.h	Sun Nov 20 21:34:54 2016 -0800
    40.3 @@ -25,8 +25,8 @@
    40.4   *  Header for the enumerated pixel format definitions.
    40.5   */
    40.6  
    40.7 -#ifndef _SDL_pixels_h
    40.8 -#define _SDL_pixels_h
    40.9 +#ifndef SDL_pixels_h_
   40.10 +#define SDL_pixels_h_
   40.11  
   40.12  #include "SDL_stdinc.h"
   40.13  #include "SDL_endian.h"
   40.14 @@ -463,6 +463,6 @@
   40.15  #endif
   40.16  #include "close_code.h"
   40.17  
   40.18 -#endif /* _SDL_pixels_h */
   40.19 +#endif /* SDL_pixels_h_ */
   40.20  
   40.21  /* vi: set ts=4 sw=4 expandtab: */
    41.1 --- a/include/SDL_platform.h	Sun Nov 20 21:29:27 2016 -0800
    41.2 +++ b/include/SDL_platform.h	Sun Nov 20 21:34:54 2016 -0800
    41.3 @@ -25,8 +25,8 @@
    41.4   *  Try to get a standard set of platform defines.
    41.5   */
    41.6  
    41.7 -#ifndef _SDL_platform_h
    41.8 -#define _SDL_platform_h
    41.9 +#ifndef SDL_platform_h_
   41.10 +#define SDL_platform_h_
   41.11  
   41.12  #if defined(_AIX)
   41.13  #undef __AIX__
   41.14 @@ -180,6 +180,6 @@
   41.15  #endif
   41.16  #include "close_code.h"
   41.17  
   41.18 -#endif /* _SDL_platform_h */
   41.19 +#endif /* SDL_platform_h_ */
   41.20  
   41.21  /* vi: set ts=4 sw=4 expandtab: */
    42.1 --- a/include/SDL_power.h	Sun Nov 20 21:29:27 2016 -0800
    42.2 +++ b/include/SDL_power.h	Sun Nov 20 21:34:54 2016 -0800
    42.3 @@ -19,8 +19,8 @@
    42.4    3. This notice may not be removed or altered from any source distribution.
    42.5  */
    42.6  
    42.7 -#ifndef _SDL_power_h
    42.8 -#define _SDL_power_h
    42.9 +#ifndef SDL_power_h_
   42.10 +#define SDL_power_h_
   42.11  
   42.12  /**
   42.13   *  \file SDL_power.h
   42.14 @@ -70,6 +70,6 @@
   42.15  #endif
   42.16  #include "close_code.h"
   42.17  
   42.18 -#endif /* _SDL_power_h */
   42.19 +#endif /* SDL_power_h_ */
   42.20  
   42.21  /* vi: set ts=4 sw=4 expandtab: */
    43.1 --- a/include/SDL_quit.h	Sun Nov 20 21:29:27 2016 -0800
    43.2 +++ b/include/SDL_quit.h	Sun Nov 20 21:34:54 2016 -0800
    43.3 @@ -25,8 +25,8 @@
    43.4   *  Include file for SDL quit event handling.
    43.5   */
    43.6  
    43.7 -#ifndef _SDL_quit_h
    43.8 -#define _SDL_quit_h
    43.9 +#ifndef SDL_quit_h_
   43.10 +#define SDL_quit_h_
   43.11  
   43.12  #include "SDL_stdinc.h"
   43.13  #include "SDL_error.h"
   43.14 @@ -55,4 +55,4 @@
   43.15  #define SDL_QuitRequested() \
   43.16          (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0))
   43.17  
   43.18 -#endif /* _SDL_quit_h */
   43.19 +#endif /* SDL_quit_h_ */
    44.1 --- a/include/SDL_rect.h	Sun Nov 20 21:29:27 2016 -0800
    44.2 +++ b/include/SDL_rect.h	Sun Nov 20 21:34:54 2016 -0800
    44.3 @@ -25,8 +25,8 @@
    44.4   *  Header file for SDL_rect definition and management functions.
    44.5   */
    44.6  
    44.7 -#ifndef _SDL_rect_h
    44.8 -#define _SDL_rect_h
    44.9 +#ifndef SDL_rect_h_
   44.10 +#define SDL_rect_h_
   44.11  
   44.12  #include "SDL_stdinc.h"
   44.13  #include "SDL_error.h"
   44.14 @@ -143,6 +143,6 @@
   44.15  #endif
   44.16  #include "close_code.h"
   44.17  
   44.18 -#endif /* _SDL_rect_h */
   44.19 +#endif /* SDL_rect_h_ */
   44.20  
   44.21  /* vi: set ts=4 sw=4 expandtab: */
    45.1 --- a/include/SDL_render.h	Sun Nov 20 21:29:27 2016 -0800
    45.2 +++ b/include/SDL_render.h	Sun Nov 20 21:34:54 2016 -0800
    45.3 @@ -45,8 +45,8 @@
    45.4   *  See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995
    45.5   */
    45.6  
    45.7 -#ifndef _SDL_render_h
    45.8 -#define _SDL_render_h
    45.9 +#ifndef SDL_render_h_
   45.10 +#define SDL_render_h_
   45.11  
   45.12  #include "SDL_stdinc.h"
   45.13  #include "SDL_rect.h"
   45.14 @@ -900,6 +900,6 @@
   45.15  #endif
   45.16  #include "close_code.h"
   45.17  
   45.18 -#endif /* _SDL_render_h */
   45.19 +#endif /* SDL_render_h_ */
   45.20  
   45.21  /* vi: set ts=4 sw=4 expandtab: */
    46.1 --- a/include/SDL_rwops.h	Sun Nov 20 21:29:27 2016 -0800
    46.2 +++ b/include/SDL_rwops.h	Sun Nov 20 21:34:54 2016 -0800
    46.3 @@ -26,8 +26,8 @@
    46.4   *  data streams.  It can easily be extended to files, memory, etc.
    46.5   */
    46.6  
    46.7 -#ifndef _SDL_rwops_h
    46.8 -#define _SDL_rwops_h
    46.9 +#ifndef SDL_rwops_h_
   46.10 +#define SDL_rwops_h_
   46.11  
   46.12  #include "SDL_stdinc.h"
   46.13  #include "SDL_error.h"
   46.14 @@ -226,6 +226,6 @@
   46.15  #endif
   46.16  #include "close_code.h"
   46.17  
   46.18 -#endif /* _SDL_rwops_h */
   46.19 +#endif /* SDL_rwops_h_ */
   46.20  
   46.21  /* vi: set ts=4 sw=4 expandtab: */
    47.1 --- a/include/SDL_scancode.h	Sun Nov 20 21:29:27 2016 -0800
    47.2 +++ b/include/SDL_scancode.h	Sun Nov 20 21:34:54 2016 -0800
    47.3 @@ -25,8 +25,8 @@
    47.4   *  Defines keyboard scancodes.
    47.5   */
    47.6  
    47.7 -#ifndef _SDL_scancode_h
    47.8 -#define _SDL_scancode_h
    47.9 +#ifndef SDL_scancode_h_
   47.10 +#define SDL_scancode_h_
   47.11  
   47.12  #include "SDL_stdinc.h"
   47.13  
   47.14 @@ -396,6 +396,6 @@
   47.15                                   for array bounds */
   47.16  } SDL_Scancode;
   47.17  
   47.18 -#endif /* _SDL_scancode_h */
   47.19 +#endif /* SDL_scancode_h_ */
   47.20  
   47.21  /* vi: set ts=4 sw=4 expandtab: */
    48.1 --- a/include/SDL_shape.h	Sun Nov 20 21:29:27 2016 -0800
    48.2 +++ b/include/SDL_shape.h	Sun Nov 20 21:34:54 2016 -0800
    48.3 @@ -19,8 +19,8 @@
    48.4    3. This notice may not be removed or altered from any source distribution.
    48.5  */
    48.6  
    48.7 -#ifndef _SDL_shape_h
    48.8 -#define _SDL_shape_h
    48.9 +#ifndef SDL_shape_h_
   48.10 +#define SDL_shape_h_
   48.11  
   48.12  #include "SDL_stdinc.h"
   48.13  #include "SDL_pixels.h"
   48.14 @@ -140,4 +140,4 @@
   48.15  #endif
   48.16  #include "close_code.h"
   48.17  
   48.18 -#endif /* _SDL_shape_h */
   48.19 +#endif /* SDL_shape_h_ */
    49.1 --- a/include/SDL_stdinc.h	Sun Nov 20 21:29:27 2016 -0800
    49.2 +++ b/include/SDL_stdinc.h	Sun Nov 20 21:34:54 2016 -0800
    49.3 @@ -25,8 +25,8 @@
    49.4   *  This is a general header that includes C language support.
    49.5   */
    49.6  
    49.7 -#ifndef _SDL_stdinc_h
    49.8 -#define _SDL_stdinc_h
    49.9 +#ifndef SDL_stdinc_h_
   49.10 +#define SDL_stdinc_h_
   49.11  
   49.12  #include "SDL_config.h"
   49.13  
   49.14 @@ -526,6 +526,6 @@
   49.15  #endif
   49.16  #include "close_code.h"
   49.17  
   49.18 -#endif /* _SDL_stdinc_h */
   49.19 +#endif /* SDL_stdinc_h_ */
   49.20  
   49.21  /* vi: set ts=4 sw=4 expandtab: */
    50.1 --- a/include/SDL_surface.h	Sun Nov 20 21:29:27 2016 -0800
    50.2 +++ b/include/SDL_surface.h	Sun Nov 20 21:34:54 2016 -0800
    50.3 @@ -25,8 +25,8 @@
    50.4   *  Header file for ::SDL_Surface definition and management functions.
    50.5   */
    50.6  
    50.7 -#ifndef _SDL_surface_h
    50.8 -#define _SDL_surface_h
    50.9 +#ifndef SDL_surface_h_
   50.10 +#define SDL_surface_h_
   50.11  
   50.12  #include "SDL_stdinc.h"
   50.13  #include "SDL_pixels.h"
   50.14 @@ -508,6 +508,6 @@
   50.15  #endif
   50.16  #include "close_code.h"
   50.17  
   50.18 -#endif /* _SDL_surface_h */
   50.19 +#endif /* SDL_surface_h_ */
   50.20  
   50.21  /* vi: set ts=4 sw=4 expandtab: */
    51.1 --- a/include/SDL_system.h	Sun Nov 20 21:29:27 2016 -0800
    51.2 +++ b/include/SDL_system.h	Sun Nov 20 21:34:54 2016 -0800
    51.3 @@ -25,8 +25,8 @@
    51.4   *  Include file for platform specific SDL API functions
    51.5   */
    51.6  
    51.7 -#ifndef _SDL_system_h
    51.8 -#define _SDL_system_h
    51.9 +#ifndef SDL_system_h_
   51.10 +#define SDL_system_h_
   51.11  
   51.12  #include "SDL_stdinc.h"
   51.13  #include "SDL_keyboard.h"
   51.14 @@ -211,6 +211,6 @@
   51.15  #endif
   51.16  #include "close_code.h"
   51.17  
   51.18 -#endif /* _SDL_system_h */
   51.19 +#endif /* SDL_system_h_ */
   51.20  
   51.21  /* vi: set ts=4 sw=4 expandtab: */
    52.1 --- a/include/SDL_syswm.h	Sun Nov 20 21:29:27 2016 -0800
    52.2 +++ b/include/SDL_syswm.h	Sun Nov 20 21:34:54 2016 -0800
    52.3 @@ -25,8 +25,8 @@
    52.4   *  Include file for SDL custom system window manager hooks.
    52.5   */
    52.6  
    52.7 -#ifndef _SDL_syswm_h
    52.8 -#define _SDL_syswm_h
    52.9 +#ifndef SDL_syswm_h_
   52.10 +#define SDL_syswm_h_
   52.11  
   52.12  #include "SDL_stdinc.h"
   52.13  #include "SDL_error.h"
   52.14 @@ -317,6 +317,6 @@
   52.15  #endif
   52.16  #include "close_code.h"
   52.17  
   52.18 -#endif /* _SDL_syswm_h */
   52.19 +#endif /* SDL_syswm_h_ */
   52.20  
   52.21  /* vi: set ts=4 sw=4 expandtab: */
    53.1 --- a/include/SDL_test.h	Sun Nov 20 21:29:27 2016 -0800
    53.2 +++ b/include/SDL_test.h	Sun Nov 20 21:34:54 2016 -0800
    53.3 @@ -27,8 +27,8 @@
    53.4   *  This code is a part of the SDL2_test library, not the main SDL library.
    53.5   */
    53.6  
    53.7 -#ifndef _SDL_test_h
    53.8 -#define _SDL_test_h
    53.9 +#ifndef SDL_test_h_
   53.10 +#define SDL_test_h_
   53.11  
   53.12  #include "SDL.h"
   53.13  #include "SDL_test_common.h"
   53.14 @@ -63,6 +63,6 @@
   53.15  #endif
   53.16  #include "close_code.h"
   53.17  
   53.18 -#endif /* _SDL_test_h */
   53.19 +#endif /* SDL_test_h_ */
   53.20  
   53.21  /* vi: set ts=4 sw=4 expandtab: */
    54.1 --- a/include/SDL_test_assert.h	Sun Nov 20 21:29:27 2016 -0800
    54.2 +++ b/include/SDL_test_assert.h	Sun Nov 20 21:34:54 2016 -0800
    54.3 @@ -33,8 +33,8 @@
    54.4   *
    54.5   */
    54.6  
    54.7 -#ifndef _SDL_test_assert_h
    54.8 -#define _SDL_test_assert_h
    54.9 +#ifndef SDL_test_assert_h_
   54.10 +#define SDL_test_assert_h_
   54.11  
   54.12  #include "begin_code.h"
   54.13  /* Set up for C function definitions, even when using C++ */
   54.14 @@ -100,6 +100,6 @@
   54.15  #endif
   54.16  #include "close_code.h"
   54.17  
   54.18 -#endif /* _SDL_test_assert_h */
   54.19 +#endif /* SDL_test_assert_h_ */
   54.20  
   54.21  /* vi: set ts=4 sw=4 expandtab: */
    55.1 --- a/include/SDL_test_common.h	Sun Nov 20 21:29:27 2016 -0800
    55.2 +++ b/include/SDL_test_common.h	Sun Nov 20 21:34:54 2016 -0800
    55.3 @@ -29,8 +29,8 @@
    55.4  
    55.5  /* Ported from original test\common.h file. */
    55.6  
    55.7 -#ifndef _SDL_test_common_h
    55.8 -#define _SDL_test_common_h
    55.9 +#ifndef SDL_test_common_h_
   55.10 +#define SDL_test_common_h_
   55.11  
   55.12  #include "SDL.h"
   55.13  
   55.14 @@ -183,6 +183,6 @@
   55.15  #endif
   55.16  #include "close_code.h"
   55.17  
   55.18 -#endif /* _SDL_test_common_h */
   55.19 +#endif /* SDL_test_common_h_ */
   55.20  
   55.21  /* vi: set ts=4 sw=4 expandtab: */
    56.1 --- a/include/SDL_test_compare.h	Sun Nov 20 21:29:27 2016 -0800
    56.2 +++ b/include/SDL_test_compare.h	Sun Nov 20 21:34:54 2016 -0800
    56.3 @@ -33,8 +33,8 @@
    56.4  
    56.5  */
    56.6  
    56.7 -#ifndef _SDL_test_compare_h
    56.8 -#define _SDL_test_compare_h
    56.9 +#ifndef SDL_test_compare_h_
   56.10 +#define SDL_test_compare_h_
   56.11  
   56.12  #include "SDL.h"
   56.13  
   56.14 @@ -64,6 +64,6 @@
   56.15  #endif
   56.16  #include "close_code.h"
   56.17  
   56.18 -#endif /* _SDL_test_compare_h */
   56.19 +#endif /* SDL_test_compare_h_ */
   56.20  
   56.21  /* vi: set ts=4 sw=4 expandtab: */
    57.1 --- a/include/SDL_test_crc32.h	Sun Nov 20 21:29:27 2016 -0800
    57.2 +++ b/include/SDL_test_crc32.h	Sun Nov 20 21:34:54 2016 -0800
    57.3 @@ -33,8 +33,8 @@
    57.4  
    57.5  */
    57.6  
    57.7 -#ifndef _SDL_test_crc32_h
    57.8 -#define _SDL_test_crc32_h
    57.9 +#ifndef SDL_test_crc32_h_
   57.10 +#define SDL_test_crc32_h_
   57.11  
   57.12  #include "begin_code.h"
   57.13  /* Set up for C function definitions, even when using C++ */
   57.14 @@ -119,6 +119,6 @@
   57.15  #endif
   57.16  #include "close_code.h"
   57.17  
   57.18 -#endif /* _SDL_test_crc32_h */
   57.19 +#endif /* SDL_test_crc32_h_ */
   57.20  
   57.21  /* vi: set ts=4 sw=4 expandtab: */
    58.1 --- a/include/SDL_test_font.h	Sun Nov 20 21:29:27 2016 -0800
    58.2 +++ b/include/SDL_test_font.h	Sun Nov 20 21:34:54 2016 -0800
    58.3 @@ -27,8 +27,8 @@
    58.4   *  This code is a part of the SDL2_test library, not the main SDL library.
    58.5   */
    58.6  
    58.7 -#ifndef _SDL_test_font_h
    58.8 -#define _SDL_test_font_h
    58.9 +#ifndef SDL_test_font_h_
   58.10 +#define SDL_test_font_h_
   58.11  
   58.12  #include "begin_code.h"
   58.13  /* Set up for C function definitions, even when using C++ */
   58.14 @@ -71,6 +71,6 @@
   58.15  #endif
   58.16  #include "close_code.h"
   58.17  
   58.18 -#endif /* _SDL_test_font_h */
   58.19 +#endif /* SDL_test_font_h_ */
   58.20  
   58.21  /* vi: set ts=4 sw=4 expandtab: */
    59.1 --- a/include/SDL_test_fuzzer.h	Sun Nov 20 21:29:27 2016 -0800
    59.2 +++ b/include/SDL_test_fuzzer.h	Sun Nov 20 21:34:54 2016 -0800
    59.3 @@ -33,8 +33,8 @@
    59.4  
    59.5  */
    59.6  
    59.7 -#ifndef _SDL_test_fuzzer_h
    59.8 -#define _SDL_test_fuzzer_h
    59.9 +#ifndef SDL_test_fuzzer_h_
   59.10 +#define SDL_test_fuzzer_h_
   59.11  
   59.12  #include "begin_code.h"
   59.13  /* Set up for C function definitions, even when using C++ */
   59.14 @@ -379,6 +379,6 @@
   59.15  #endif
   59.16  #include "close_code.h"
   59.17  
   59.18 -#endif /* _SDL_test_fuzzer_h */
   59.19 +#endif /* SDL_test_fuzzer_h_ */
   59.20  
   59.21  /* vi: set ts=4 sw=4 expandtab: */
    60.1 --- a/include/SDL_test_harness.h	Sun Nov 20 21:29:27 2016 -0800
    60.2 +++ b/include/SDL_test_harness.h	Sun Nov 20 21:34:54 2016 -0800
    60.3 @@ -33,8 +33,8 @@
    60.4    Based on original GSOC code by Markus Kauppila <markus.kauppila@gmail.com>
    60.5  */
    60.6  
    60.7 -#ifndef _SDL_test_harness_h
    60.8 -#define _SDL_test_harness_h
    60.9 +#ifndef SDL_test_h_arness_h
   60.10 +#define SDL_test_h_arness_h
   60.11  
   60.12  #include "begin_code.h"
   60.13  /* Set up for C function definitions, even when using C++ */
   60.14 @@ -129,6 +129,6 @@
   60.15  #endif
   60.16  #include "close_code.h"
   60.17  
   60.18 -#endif /* _SDL_test_harness_h */
   60.19 +#endif /* SDL_test_h_arness_h */
   60.20  
   60.21  /* vi: set ts=4 sw=4 expandtab: */
    61.1 --- a/include/SDL_test_images.h	Sun Nov 20 21:29:27 2016 -0800
    61.2 +++ b/include/SDL_test_images.h	Sun Nov 20 21:34:54 2016 -0800
    61.3 @@ -33,8 +33,8 @@
    61.4  
    61.5  */
    61.6  
    61.7 -#ifndef _SDL_test_images_h
    61.8 -#define _SDL_test_images_h
    61.9 +#ifndef SDL_test_images_h_
   61.10 +#define SDL_test_images_h_
   61.11  
   61.12  #include "SDL.h"
   61.13  
   61.14 @@ -73,6 +73,6 @@
   61.15  #endif
   61.16  #include "close_code.h"
   61.17  
   61.18 -#endif /* _SDL_test_images_h */
   61.19 +#endif /* SDL_test_images_h_ */
   61.20  
   61.21  /* vi: set ts=4 sw=4 expandtab: */
    62.1 --- a/include/SDL_test_log.h	Sun Nov 20 21:29:27 2016 -0800
    62.2 +++ b/include/SDL_test_log.h	Sun Nov 20 21:34:54 2016 -0800
    62.3 @@ -33,8 +33,8 @@
    62.4   *
    62.5   */
    62.6  
    62.7 -#ifndef _SDL_test_log_h
    62.8 -#define _SDL_test_log_h
    62.9 +#ifndef SDL_test_log_h_
   62.10 +#define SDL_test_log_h_
   62.11  
   62.12  #include "begin_code.h"
   62.13  /* Set up for C function definitions, even when using C++ */
   62.14 @@ -62,6 +62,6 @@
   62.15  #endif
   62.16  #include "close_code.h"
   62.17  
   62.18 -#endif /* _SDL_test_log_h */
   62.19 +#endif /* SDL_test_log_h_ */
   62.20  
   62.21  /* vi: set ts=4 sw=4 expandtab: */
    63.1 --- a/include/SDL_test_md5.h	Sun Nov 20 21:29:27 2016 -0800
    63.2 +++ b/include/SDL_test_md5.h	Sun Nov 20 21:34:54 2016 -0800
    63.3 @@ -53,8 +53,8 @@
    63.4   ***********************************************************************
    63.5  */
    63.6  
    63.7 -#ifndef _SDL_test_md5_h
    63.8 -#define _SDL_test_md5_h
    63.9 +#ifndef SDL_test_md5_h_
   63.10 +#define SDL_test_md5_h_
   63.11  
   63.12  #include "begin_code.h"
   63.13  /* Set up for C function definitions, even when using C++ */
   63.14 @@ -124,6 +124,6 @@
   63.15  #endif
   63.16  #include "close_code.h"
   63.17  
   63.18 -#endif /* _SDL_test_md5_h */
   63.19 +#endif /* SDL_test_md5_h_ */
   63.20  
   63.21  /* vi: set ts=4 sw=4 expandtab: */
    64.1 --- a/include/SDL_test_random.h	Sun Nov 20 21:29:27 2016 -0800
    64.2 +++ b/include/SDL_test_random.h	Sun Nov 20 21:34:54 2016 -0800
    64.3 @@ -37,8 +37,8 @@
    64.4  
    64.5  */
    64.6  
    64.7 -#ifndef _SDL_test_random_h
    64.8 -#define _SDL_test_random_h
    64.9 +#ifndef SDL_test_random_h_
   64.10 +#define SDL_test_random_h_
   64.11  
   64.12  #include "begin_code.h"
   64.13  /* Set up for C function definitions, even when using C++ */
   64.14 @@ -110,6 +110,6 @@
   64.15  #endif
   64.16  #include "close_code.h"
   64.17  
   64.18 -#endif /* _SDL_test_random_h */
   64.19 +#endif /* SDL_test_random_h_ */
   64.20  
   64.21  /* vi: set ts=4 sw=4 expandtab: */
    65.1 --- a/include/SDL_thread.h	Sun Nov 20 21:29:27 2016 -0800
    65.2 +++ b/include/SDL_thread.h	Sun Nov 20 21:34:54 2016 -0800
    65.3 @@ -19,8 +19,8 @@
    65.4    3. This notice may not be removed or altered from any source distribution.
    65.5  */
    65.6  
    65.7 -#ifndef _SDL_thread_h
    65.8 -#define _SDL_thread_h
    65.9 +#ifndef SDL_thread_h_
   65.10 +#define SDL_thread_h_
   65.11  
   65.12  /**
   65.13   *  \file SDL_thread.h
   65.14 @@ -282,6 +282,6 @@
   65.15  #endif
   65.16  #include "close_code.h"
   65.17  
   65.18 -#endif /* _SDL_thread_h */
   65.19 +#endif /* SDL_thread_h_ */
   65.20  
   65.21  /* vi: set ts=4 sw=4 expandtab: */
    66.1 --- a/include/SDL_timer.h	Sun Nov 20 21:29:27 2016 -0800
    66.2 +++ b/include/SDL_timer.h	Sun Nov 20 21:34:54 2016 -0800
    66.3 @@ -19,8 +19,8 @@
    66.4    3. This notice may not be removed or altered from any source distribution.
    66.5  */
    66.6  
    66.7 -#ifndef _SDL_timer_h
    66.8 -#define _SDL_timer_h
    66.9 +#ifndef SDL_timer_h_
   66.10 +#define SDL_timer_h_
   66.11  
   66.12  /**
   66.13   *  \file SDL_timer.h
   66.14 @@ -110,6 +110,6 @@
   66.15  #endif
   66.16  #include "close_code.h"
   66.17  
   66.18 -#endif /* _SDL_timer_h */
   66.19 +#endif /* SDL_timer_h_ */
   66.20  
   66.21  /* vi: set ts=4 sw=4 expandtab: */
    67.1 --- a/include/SDL_touch.h	Sun Nov 20 21:29:27 2016 -0800
    67.2 +++ b/include/SDL_touch.h	Sun Nov 20 21:34:54 2016 -0800
    67.3 @@ -25,8 +25,8 @@
    67.4   *  Include file for SDL touch event handling.
    67.5   */
    67.6  
    67.7 -#ifndef _SDL_touch_h
    67.8 -#define _SDL_touch_h
    67.9 +#ifndef SDL_touch_h_
   67.10 +#define SDL_touch_h_
   67.11  
   67.12  #include "SDL_stdinc.h"
   67.13  #include "SDL_error.h"
   67.14 @@ -81,6 +81,6 @@
   67.15  #endif
   67.16  #include "close_code.h"
   67.17  
   67.18 -#endif /* _SDL_touch_h */
   67.19 +#endif /* SDL_touch_h_ */
   67.20  
   67.21  /* vi: set ts=4 sw=4 expandtab: */
    68.1 --- a/include/SDL_version.h	Sun Nov 20 21:29:27 2016 -0800
    68.2 +++ b/include/SDL_version.h	Sun Nov 20 21:34:54 2016 -0800
    68.3 @@ -25,8 +25,8 @@
    68.4   *  This header defines the current SDL version.
    68.5   */
    68.6  
    68.7 -#ifndef _SDL_version_h
    68.8 -#define _SDL_version_h
    68.9 +#ifndef SDL_version_h_
   68.10 +#define SDL_version_h_
   68.11  
   68.12  #include "SDL_stdinc.h"
   68.13  
   68.14 @@ -157,6 +157,6 @@
   68.15  #endif
   68.16  #include "close_code.h"
   68.17  
   68.18 -#endif /* _SDL_version_h */
   68.19 +#endif /* SDL_version_h_ */
   68.20  
   68.21  /* vi: set ts=4 sw=4 expandtab: */
    69.1 --- a/include/SDL_video.h	Sun Nov 20 21:29:27 2016 -0800
    69.2 +++ b/include/SDL_video.h	Sun Nov 20 21:34:54 2016 -0800
    69.3 @@ -25,8 +25,8 @@
    69.4   *  Header file for SDL video functions.
    69.5   */
    69.6  
    69.7 -#ifndef _SDL_video_h
    69.8 -#define _SDL_video_h
    69.9 +#ifndef SDL_video_h_
   69.10 +#define SDL_video_h_
   69.11  
   69.12  #include "SDL_stdinc.h"
   69.13  #include "SDL_pixels.h"
   69.14 @@ -1213,6 +1213,6 @@
   69.15  #endif
   69.16  #include "close_code.h"
   69.17  
   69.18 -#endif /* _SDL_video_h */
   69.19 +#endif /* SDL_video_h_ */
   69.20  
   69.21  /* vi: set ts=4 sw=4 expandtab: */
    70.1 --- a/src/SDL_error_c.h	Sun Nov 20 21:29:27 2016 -0800
    70.2 +++ b/src/SDL_error_c.h	Sun Nov 20 21:34:54 2016 -0800
    70.3 @@ -24,8 +24,8 @@
    70.4     error messages
    70.5  */
    70.6  
    70.7 -#ifndef _SDL_error_c_h
    70.8 -#define _SDL_error_c_h
    70.9 +#ifndef SDL_error_c_h_
   70.10 +#define SDL_error_c_h_
   70.11  
   70.12  #define ERR_MAX_STRLEN  128
   70.13  #define ERR_MAX_ARGS    5
   70.14 @@ -59,6 +59,6 @@
   70.15  /* Defined in SDL_thread.c */
   70.16  extern SDL_error *SDL_GetErrBuf(void);
   70.17  
   70.18 -#endif /* _SDL_error_c_h */
   70.19 +#endif /* SDL_error_c_h_ */
   70.20  
   70.21  /* vi: set ts=4 sw=4 expandtab: */
    71.1 --- a/src/SDL_internal.h	Sun Nov 20 21:29:27 2016 -0800
    71.2 +++ b/src/SDL_internal.h	Sun Nov 20 21:34:54 2016 -0800
    71.3 @@ -18,8 +18,8 @@
    71.4       misrepresented as being the original software.
    71.5    3. This notice may not be removed or altered from any source distribution.
    71.6  */
    71.7 -#ifndef _SDL_internal_h
    71.8 -#define _SDL_internal_h
    71.9 +#ifndef SDL_internal_h_
   71.10 +#define SDL_internal_h_
   71.11  
   71.12  /* Many of SDL's features require _GNU_SOURCE on various platforms */
   71.13  #ifndef _GNU_SOURCE
   71.14 @@ -38,6 +38,6 @@
   71.15  
   71.16  #include "SDL_config.h"
   71.17  
   71.18 -#endif /* _SDL_internal_h */
   71.19 +#endif /* SDL_internal_h_ */
   71.20  
   71.21  /* vi: set ts=4 sw=4 expandtab: */
    72.1 --- a/src/audio/SDL_sysaudio.h	Sun Nov 20 21:29:27 2016 -0800
    72.2 +++ b/src/audio/SDL_sysaudio.h	Sun Nov 20 21:34:54 2016 -0800
    72.3 @@ -20,8 +20,8 @@
    72.4  */
    72.5  #include "../SDL_internal.h"
    72.6  
    72.7 -#ifndef _SDL_sysaudio_h
    72.8 -#define _SDL_sysaudio_h
    72.9 +#ifndef SDL_sysaudio_h_
   72.10 +#define SDL_sysaudio_h_
   72.11  
   72.12  #include "SDL_mutex.h"
   72.13  #include "SDL_thread.h"
   72.14 @@ -272,6 +272,6 @@
   72.15  
   72.16  
   72.17  
   72.18 -#endif /* _SDL_sysaudio_h */
   72.19 +#endif /* SDL_sysaudio_h_ */
   72.20  
   72.21  /* vi: set ts=4 sw=4 expandtab: */
    73.1 --- a/src/audio/alsa/SDL_alsa_audio.h	Sun Nov 20 21:29:27 2016 -0800
    73.2 +++ b/src/audio/alsa/SDL_alsa_audio.h	Sun Nov 20 21:34:54 2016 -0800
    73.3 @@ -20,8 +20,8 @@
    73.4  */
    73.5  #include "../../SDL_internal.h"
    73.6  
    73.7 -#ifndef _SDL_ALSA_audio_h
    73.8 -#define _SDL_ALSA_audio_h
    73.9 +#ifndef SDL_ALSA_audio_h_
   73.10 +#define SDL_ALSA_audio_h_
   73.11  
   73.12  #include <alsa/asoundlib.h>
   73.13  
   73.14 @@ -43,6 +43,6 @@
   73.15      void (*swizzle_func)(_THIS, void *buffer, Uint32 bufferlen);
   73.16  };
   73.17  
   73.18 -#endif /* _SDL_ALSA_audio_h */
   73.19 +#endif /* SDL_ALSA_audio_h_ */
   73.20  
   73.21  /* vi: set ts=4 sw=4 expandtab: */
    74.1 --- a/src/audio/disk/SDL_diskaudio.h	Sun Nov 20 21:29:27 2016 -0800
    74.2 +++ b/src/audio/disk/SDL_diskaudio.h	Sun Nov 20 21:34:54 2016 -0800
    74.3 @@ -20,8 +20,8 @@
    74.4  */
    74.5  #include "../../SDL_internal.h"
    74.6  
    74.7 -#ifndef _SDL_diskaudio_h
    74.8 -#define _SDL_diskaudio_h
    74.9 +#ifndef SDL_diskaudio_h_
   74.10 +#define SDL_diskaudio_h_
   74.11  
   74.12  #include "SDL_rwops.h"
   74.13  #include "../SDL_sysaudio.h"
   74.14 @@ -37,5 +37,5 @@
   74.15      Uint8 *mixbuf;
   74.16  };
   74.17  
   74.18 -#endif /* _SDL_diskaudio_h */
   74.19 +#endif /* SDL_diskaudio_h_ */
   74.20  /* vi: set ts=4 sw=4 expandtab: */
    75.1 --- a/src/audio/dsp/SDL_dspaudio.h	Sun Nov 20 21:29:27 2016 -0800
    75.2 +++ b/src/audio/dsp/SDL_dspaudio.h	Sun Nov 20 21:34:54 2016 -0800
    75.3 @@ -20,8 +20,8 @@
    75.4  */
    75.5  #include "../../SDL_internal.h"
    75.6  
    75.7 -#ifndef _SDL_dspaudio_h
    75.8 -#define _SDL_dspaudio_h
    75.9 +#ifndef SDL_dspaudio_h_
   75.10 +#define SDL_dspaudio_h_
   75.11  
   75.12  #include "../SDL_sysaudio.h"
   75.13  
   75.14 @@ -39,5 +39,5 @@
   75.15  };
   75.16  #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
   75.17  
   75.18 -#endif /* _SDL_dspaudio_h */
   75.19 +#endif /* SDL_dspaudio_h_ */
   75.20  /* vi: set ts=4 sw=4 expandtab: */
    76.1 --- a/src/audio/dummy/SDL_dummyaudio.h	Sun Nov 20 21:29:27 2016 -0800
    76.2 +++ b/src/audio/dummy/SDL_dummyaudio.h	Sun Nov 20 21:34:54 2016 -0800
    76.3 @@ -20,8 +20,8 @@
    76.4  */
    76.5  #include "../../SDL_internal.h"
    76.6  
    76.7 -#ifndef _SDL_dummyaudio_h
    76.8 -#define _SDL_dummyaudio_h
    76.9 +#ifndef SDL_dummyaudio_h_
   76.10 +#define SDL_dummyaudio_h_
   76.11  
   76.12  #include "../SDL_sysaudio.h"
   76.13  
   76.14 @@ -37,5 +37,5 @@
   76.15      Uint32 initial_calls;
   76.16  };
   76.17  
   76.18 -#endif /* _SDL_dummyaudio_h */
   76.19 +#endif /* SDL_dummyaudio_h_ */
   76.20  /* vi: set ts=4 sw=4 expandtab: */
    77.1 --- a/src/audio/nas/SDL_nasaudio.h	Sun Nov 20 21:29:27 2016 -0800
    77.2 +++ b/src/audio/nas/SDL_nasaudio.h	Sun Nov 20 21:34:54 2016 -0800
    77.3 @@ -20,8 +20,8 @@
    77.4  */
    77.5  #include "../../SDL_internal.h"
    77.6  
    77.7 -#ifndef _SDL_nasaudio_h
    77.8 -#define _SDL_nasaudio_h
    77.9 +#ifndef SDL_nasaudio_h_
   77.10 +#define SDL_nasaudio_h_
   77.11  
   77.12  #ifdef __sgi
   77.13  #include <nas/audiolib.h>
   77.14 @@ -51,6 +51,6 @@
   77.15      struct timeval last_tv;
   77.16      int buf_free;
   77.17  };
   77.18 -#endif /* _SDL_nasaudio_h */
   77.19 +#endif /* SDL_nasaudio_h_ */
   77.20  
   77.21  /* vi: set ts=4 sw=4 expandtab: */
    78.1 --- a/src/audio/pulseaudio/SDL_pulseaudio.h	Sun Nov 20 21:29:27 2016 -0800
    78.2 +++ b/src/audio/pulseaudio/SDL_pulseaudio.h	Sun Nov 20 21:34:54 2016 -0800
    78.3 @@ -20,8 +20,8 @@
    78.4  */
    78.5  #include "../../SDL_internal.h"
    78.6  
    78.7 -#ifndef _SDL_pulseaudio_h
    78.8 -#define _SDL_pulseaudio_h
    78.9 +#ifndef SDL_pulseaudio_h_
   78.10 +#define SDL_pulseaudio_h_
   78.11  
   78.12  #include <pulse/simple.h>
   78.13  
   78.14 @@ -47,6 +47,6 @@
   78.15      int capturelen;
   78.16  };
   78.17  
   78.18 -#endif /* _SDL_pulseaudio_h */
   78.19 +#endif /* SDL_pulseaudio_h_ */
   78.20  
   78.21  /* vi: set ts=4 sw=4 expandtab: */
    79.1 --- a/src/core/linux/SDL_dbus.h	Sun Nov 20 21:29:27 2016 -0800
    79.2 +++ b/src/core/linux/SDL_dbus.h	Sun Nov 20 21:34:54 2016 -0800
    79.3 @@ -21,8 +21,8 @@
    79.4  
    79.5  #include "../../SDL_internal.h"
    79.6  
    79.7 -#ifndef _SDL_dbus_h
    79.8 -#define _SDL_dbus_h
    79.9 +#ifndef SDL_dbus_h_
   79.10 +#define SDL_dbus_h_
   79.11  
   79.12  #ifdef HAVE_DBUS_DBUS_H
   79.13  #define SDL_USE_LIBDBUS 1
   79.14 @@ -77,6 +77,6 @@
   79.15  
   79.16  #endif /* HAVE_DBUS_DBUS_H */
   79.17  
   79.18 -#endif /* _SDL_dbus_h */
   79.19 +#endif /* SDL_dbus_h_ */
   79.20  
   79.21  /* vi: set ts=4 sw=4 expandtab: */
    80.1 --- a/src/core/linux/SDL_evdev.h	Sun Nov 20 21:29:27 2016 -0800
    80.2 +++ b/src/core/linux/SDL_evdev.h	Sun Nov 20 21:34:54 2016 -0800
    80.3 @@ -21,8 +21,8 @@
    80.4  
    80.5  #include "../../SDL_internal.h"
    80.6  
    80.7 -#ifndef _SDL_evdev_h
    80.8 -#define _SDL_evdev_h
    80.9 +#ifndef SDL_evdev_h_
   80.10 +#define SDL_evdev_h_
   80.11  
   80.12  #ifdef SDL_INPUT_LINUXEV
   80.13  
   80.14 @@ -34,6 +34,6 @@
   80.15  
   80.16  #endif /* SDL_INPUT_LINUXEV */
   80.17  
   80.18 -#endif /* _SDL_evdev_h */
   80.19 +#endif /* SDL_evdev_h_ */
   80.20  
   80.21  /* vi: set ts=4 sw=4 expandtab: */
    81.1 --- a/src/core/linux/SDL_fcitx.h	Sun Nov 20 21:29:27 2016 -0800
    81.2 +++ b/src/core/linux/SDL_fcitx.h	Sun Nov 20 21:34:54 2016 -0800
    81.3 @@ -19,8 +19,8 @@
    81.4    3. This notice may not be removed or altered from any source distribution.
    81.5  */
    81.6  
    81.7 -#ifndef _SDL_fcitx_h
    81.8 -#define _SDL_fcitx_h
    81.9 +#ifndef SDL_fcitx_h_
   81.10 +#define SDL_fcitx_h_
   81.11  
   81.12  #include "../../SDL_internal.h"
   81.13  
   81.14 @@ -35,6 +35,6 @@
   81.15  extern void SDL_Fcitx_UpdateTextRect(SDL_Rect *rect);
   81.16  extern void SDL_Fcitx_PumpEvents();
   81.17  
   81.18 -#endif /* _SDL_fcitx_h */
   81.19 +#endif /* SDL_fcitx_h_ */
   81.20  
   81.21  /* vi: set ts=4 sw=4 expandtab: */
    82.1 --- a/src/core/linux/SDL_ibus.h	Sun Nov 20 21:29:27 2016 -0800
    82.2 +++ b/src/core/linux/SDL_ibus.h	Sun Nov 20 21:34:54 2016 -0800
    82.3 @@ -21,8 +21,8 @@
    82.4  
    82.5  #include "../../SDL_internal.h"
    82.6  
    82.7 -#ifndef _SDL_ibus_h
    82.8 -#define _SDL_ibus_h
    82.9 +#ifndef SDL_ibus_h_
   82.10 +#define SDL_ibus_h_
   82.11  
   82.12  #ifdef HAVE_IBUS_IBUS_H
   82.13  #define SDL_USE_IBUS 1
   82.14 @@ -53,6 +53,6 @@
   82.15  
   82.16  #endif /* HAVE_IBUS_IBUS_H */
   82.17  
   82.18 -#endif /* _SDL_ibus_h */
   82.19 +#endif /* SDL_ibus_h_ */
   82.20  
   82.21  /* vi: set ts=4 sw=4 expandtab: */
    83.1 --- a/src/core/linux/SDL_ime.h	Sun Nov 20 21:29:27 2016 -0800
    83.2 +++ b/src/core/linux/SDL_ime.h	Sun Nov 20 21:34:54 2016 -0800
    83.3 @@ -19,8 +19,8 @@
    83.4    3. This notice may not be removed or altered from any source distribution.
    83.5  */
    83.6  
    83.7 -#ifndef _SDL_ime_h
    83.8 -#define _SDL_ime_h
    83.9 +#ifndef SDL_ime_h_
   83.10 +#define SDL_ime_h_
   83.11  
   83.12  #include "../../SDL_internal.h"
   83.13  
   83.14 @@ -35,4 +35,4 @@
   83.15  extern void SDL_IME_UpdateTextRect(SDL_Rect *rect);
   83.16  extern void SDL_IME_PumpEvents(void);
   83.17  
   83.18 -#endif /* _SDL_ime_h */
   83.19 +#endif /* SDL_ime_h_ */
    84.1 --- a/src/core/linux/SDL_udev.h	Sun Nov 20 21:29:27 2016 -0800
    84.2 +++ b/src/core/linux/SDL_udev.h	Sun Nov 20 21:34:54 2016 -0800
    84.3 @@ -21,8 +21,8 @@
    84.4  
    84.5  #include "../../SDL_internal.h"
    84.6  
    84.7 -#ifndef _SDL_udev_h
    84.8 -#define _SDL_udev_h
    84.9 +#ifndef SDL_udev_h_
   84.10 +#define SDL_udev_h_
   84.11  
   84.12  #if HAVE_LIBUDEV_H
   84.13  
   84.14 @@ -116,4 +116,4 @@
   84.15  
   84.16  #endif /* HAVE_LIBUDEV_H */
   84.17  
   84.18 -#endif /* _SDL_udev_h */
   84.19 +#endif /* SDL_udev_h_ */
    85.1 --- a/src/dynapi/SDL_dynapi.h	Sun Nov 20 21:29:27 2016 -0800
    85.2 +++ b/src/dynapi/SDL_dynapi.h	Sun Nov 20 21:34:54 2016 -0800
    85.3 @@ -19,8 +19,8 @@
    85.4    3. This notice may not be removed or altered from any source distribution.
    85.5  */
    85.6  
    85.7 -#ifndef _SDL_dynapi_h
    85.8 -#define _SDL_dynapi_h
    85.9 +#ifndef SDL_dynapi_h_
   85.10 +#define SDL_dynapi_h_
   85.11  
   85.12  /* IMPORTANT:
   85.13     This is the master switch to disabling the dynamic API. We made it so you
    86.1 --- a/src/events/SDL_clipboardevents_c.h	Sun Nov 20 21:29:27 2016 -0800
    86.2 +++ b/src/events/SDL_clipboardevents_c.h	Sun Nov 20 21:34:54 2016 -0800
    86.3 @@ -20,11 +20,11 @@
    86.4  */
    86.5  #include "../SDL_internal.h"
    86.6  
    86.7 -#ifndef _SDL_clipboardevents_c_h
    86.8 -#define _SDL_clipboardevents_c_h
    86.9 +#ifndef SDL_clipboardevents_c_h_
   86.10 +#define SDL_clipboardevents_c_h_
   86.11  
   86.12  extern int SDL_SendClipboardUpdate(void);
   86.13  
   86.14 -#endif /* _SDL_clipboardevents_c_h */
   86.15 +#endif /* SDL_clipboardevents_c_h_ */
   86.16  
   86.17  /* vi: set ts=4 sw=4 expandtab: */
    87.1 --- a/src/events/SDL_dropevents_c.h	Sun Nov 20 21:29:27 2016 -0800
    87.2 +++ b/src/events/SDL_dropevents_c.h	Sun Nov 20 21:34:54 2016 -0800
    87.3 @@ -20,13 +20,13 @@
    87.4  */
    87.5  #include "../SDL_internal.h"
    87.6  
    87.7 -#ifndef _SDL_dropevents_c_h
    87.8 -#define _SDL_dropevents_c_h
    87.9 +#ifndef SDL_dropevents_c_h_
   87.10 +#define SDL_dropevents_c_h_
   87.11  
   87.12  extern int SDL_SendDropFile(SDL_Window *window, const char *file);
   87.13  extern int SDL_SendDropText(SDL_Window *window, const char *text);
   87.14  extern int SDL_SendDropComplete(SDL_Window *window);
   87.15  
   87.16 -#endif /* _SDL_dropevents_c_h */
   87.17 +#endif /* SDL_dropevents_c_h_ */
   87.18  
   87.19  /* vi: set ts=4 sw=4 expandtab: */
    88.1 --- a/src/events/SDL_gesture_c.h	Sun Nov 20 21:29:27 2016 -0800
    88.2 +++ b/src/events/SDL_gesture_c.h	Sun Nov 20 21:34:54 2016 -0800
    88.3 @@ -20,8 +20,8 @@
    88.4  */
    88.5  #include "../SDL_internal.h"
    88.6  
    88.7 -#ifndef _SDL_gesture_c_h
    88.8 -#define _SDL_gesture_c_h
    88.9 +#ifndef SDL_gesture_c_h_
   88.10 +#define SDL_gesture_c_h_
   88.11  
   88.12  extern int SDL_GestureAddTouch(SDL_TouchID touchId);
   88.13  
   88.14 @@ -29,6 +29,6 @@
   88.15  
   88.16  extern int SDL_RecordGesture(SDL_TouchID touchId);
   88.17  
   88.18 -#endif /* _SDL_gesture_c_h */
   88.19 +#endif /* SDL_gesture_c_h_ */
   88.20  
   88.21  /* vi: set ts=4 sw=4 expandtab: */
    89.1 --- a/src/events/SDL_keyboard_c.h	Sun Nov 20 21:29:27 2016 -0800
    89.2 +++ b/src/events/SDL_keyboard_c.h	Sun Nov 20 21:34:54 2016 -0800
    89.3 @@ -20,8 +20,8 @@
    89.4  */
    89.5  #include "../SDL_internal.h"
    89.6  
    89.7 -#ifndef _SDL_keyboard_c_h
    89.8 -#define _SDL_keyboard_c_h
    89.9 +#ifndef SDL_keyboard_c_h_
   89.10 +#define SDL_keyboard_c_h_
   89.11  
   89.12  #include "SDL_keycode.h"
   89.13  #include "SDL_events.h"
   89.14 @@ -65,6 +65,6 @@
   89.15  /* Toggle on or off pieces of the keyboard mod state. */
   89.16  extern void SDL_ToggleModState(const SDL_Keymod modstate, const SDL_bool toggle);
   89.17  
   89.18 -#endif /* _SDL_keyboard_c_h */
   89.19 +#endif /* SDL_keyboard_c_h_ */
   89.20  
   89.21  /* vi: set ts=4 sw=4 expandtab: */
    90.1 --- a/src/events/SDL_mouse_c.h	Sun Nov 20 21:29:27 2016 -0800
    90.2 +++ b/src/events/SDL_mouse_c.h	Sun Nov 20 21:34:54 2016 -0800
    90.3 @@ -20,8 +20,8 @@
    90.4  */
    90.5  #include "../SDL_internal.h"
    90.6  
    90.7 -#ifndef _SDL_mouse_c_h
    90.8 -#define _SDL_mouse_c_h
    90.9 +#ifndef SDL_mouse_c_h_
   90.10 +#define SDL_mouse_c_h_
   90.11  
   90.12  #include "SDL_mouse.h"
   90.13  
   90.14 @@ -128,6 +128,6 @@
   90.15  /* Shutdown the mouse subsystem */
   90.16  extern void SDL_MouseQuit(void);
   90.17  
   90.18 -#endif /* _SDL_mouse_c_h */
   90.19 +#endif /* SDL_mouse_c_h_ */
   90.20  
   90.21  /* vi: set ts=4 sw=4 expandtab: */
    91.1 --- a/src/events/SDL_touch_c.h	Sun Nov 20 21:29:27 2016 -0800
    91.2 +++ b/src/events/SDL_touch_c.h	Sun Nov 20 21:34:54 2016 -0800
    91.3 @@ -21,8 +21,8 @@
    91.4  #include "../SDL_internal.h"
    91.5  #include "../../include/SDL_touch.h"
    91.6  
    91.7 -#ifndef _SDL_touch_c_h
    91.8 -#define _SDL_touch_c_h
    91.9 +#ifndef SDL_touch_c_h_
   91.10 +#define SDL_touch_c_h_
   91.11  
   91.12  typedef struct SDL_Touch
   91.13  {
   91.14 @@ -56,6 +56,6 @@
   91.15  /* Shutdown the touch subsystem */
   91.16  extern void SDL_TouchQuit(void);
   91.17  
   91.18 -#endif /* _SDL_touch_c_h */
   91.19 +#endif /* SDL_touch_c_h_ */
   91.20  
   91.21  /* vi: set ts=4 sw=4 expandtab: */
    92.1 --- a/src/events/SDL_windowevents_c.h	Sun Nov 20 21:29:27 2016 -0800
    92.2 +++ b/src/events/SDL_windowevents_c.h	Sun Nov 20 21:34:54 2016 -0800
    92.3 @@ -20,12 +20,12 @@
    92.4  */
    92.5  #include "../SDL_internal.h"
    92.6  
    92.7 -#ifndef _SDL_windowevents_c_h
    92.8 -#define _SDL_windowevents_c_h
    92.9 +#ifndef SDL_windowevents_c_h_
   92.10 +#define SDL_windowevents_c_h_
   92.11  
   92.12  extern int SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent,
   92.13                                 int data1, int data2);
   92.14  
   92.15 -#endif /* _SDL_windowevents_c_h */
   92.16 +#endif /* SDL_windowevents_c_h_ */
   92.17  
   92.18  /* vi: set ts=4 sw=4 expandtab: */
    93.1 --- a/src/haptic/SDL_syshaptic.h	Sun Nov 20 21:29:27 2016 -0800
    93.2 +++ b/src/haptic/SDL_syshaptic.h	Sun Nov 20 21:34:54 2016 -0800
    93.3 @@ -21,8 +21,8 @@
    93.4  
    93.5  #include "../SDL_internal.h"
    93.6  
    93.7 -#ifndef _SDL_syshaptic_h
    93.8 -#define _SDL_syshaptic_h
    93.9 +#ifndef SDL_syshaptic_h_
   93.10 +#define SDL_syshaptic_h_
   93.11  
   93.12  #include "SDL_haptic.h"
   93.13  
   93.14 @@ -203,6 +203,6 @@
   93.15   */
   93.16  extern int SDL_SYS_HapticStopAll(SDL_Haptic * haptic);
   93.17  
   93.18 -#endif /* _SDL_syshaptic_h */
   93.19 +#endif /* SDL_syshaptic_h_ */
   93.20  
   93.21  /* vi: set ts=4 sw=4 expandtab: */
    94.1 --- a/src/joystick/SDL_sysjoystick.h	Sun Nov 20 21:29:27 2016 -0800
    94.2 +++ b/src/joystick/SDL_sysjoystick.h	Sun Nov 20 21:34:54 2016 -0800
    94.3 @@ -20,8 +20,8 @@
    94.4  */
    94.5  #include "../SDL_internal.h"
    94.6  
    94.7 -#ifndef _SDL_sysjoystick_h
    94.8 -#define _SDL_sysjoystick_h
    94.9 +#ifndef SDL_sysjoystick_h_
   94.10 +#define SDL_sysjoystick_h_
   94.11  
   94.12  /* This is the system specific header for the SDL joystick API */
   94.13  
   94.14 @@ -114,6 +114,6 @@
   94.15  extern SDL_bool SDL_SYS_IsXInputGamepad_DeviceIndex(int device_index);
   94.16  #endif
   94.17  
   94.18 -#endif /* _SDL_sysjoystick_h */
   94.19 +#endif /* SDL_sysjoystick_h_ */
   94.20  
   94.21  /* vi: set ts=4 sw=4 expandtab: */
    95.1 --- a/src/power/SDL_syspower.h	Sun Nov 20 21:29:27 2016 -0800
    95.2 +++ b/src/power/SDL_syspower.h	Sun Nov 20 21:34:54 2016 -0800
    95.3 @@ -22,8 +22,8 @@
    95.4  
    95.5  /* These are functions that need to be implemented by a port of SDL */
    95.6  
    95.7 -#ifndef _SDL_syspower_h
    95.8 -#define _SDL_syspower_h
    95.9 +#ifndef SDL_syspower_h_
   95.10 +#define SDL_syspower_h_
   95.11  
   95.12  #include "SDL_power.h"
   95.13  
   95.14 @@ -63,6 +63,6 @@
   95.15  #endif
   95.16  #endif
   95.17  
   95.18 -#endif /* _SDL_syspower_h */
   95.19 +#endif /* SDL_syspower_h_ */
   95.20  
   95.21  /* vi: set ts=4 sw=4 expandtab: */
    96.1 --- a/src/render/SDL_sysrender.h	Sun Nov 20 21:29:27 2016 -0800
    96.2 +++ b/src/render/SDL_sysrender.h	Sun Nov 20 21:34:54 2016 -0800
    96.3 @@ -20,8 +20,8 @@
    96.4  */
    96.5  #include "../SDL_internal.h"
    96.6  
    96.7 -#ifndef _SDL_sysrender_h
    96.8 -#define _SDL_sysrender_h
    96.9 +#ifndef SDL_sysrender_h_
   96.10 +#define SDL_sysrender_h_
   96.11  
   96.12  #include "SDL_render.h"
   96.13  #include "SDL_events.h"
   96.14 @@ -200,6 +200,6 @@
   96.15  
   96.16  #endif /* !SDL_RENDER_DISABLED */
   96.17  
   96.18 -#endif /* _SDL_sysrender_h */
   96.19 +#endif /* SDL_sysrender_h_ */
   96.20  
   96.21  /* vi: set ts=4 sw=4 expandtab: */
    97.1 --- a/src/thread/SDL_systhread.h	Sun Nov 20 21:29:27 2016 -0800
    97.2 +++ b/src/thread/SDL_systhread.h	Sun Nov 20 21:34:54 2016 -0800
    97.3 @@ -22,8 +22,8 @@
    97.4  
    97.5  /* These are functions that need to be implemented by a port of SDL */
    97.6  
    97.7 -#ifndef _SDL_systhread_h
    97.8 -#define _SDL_systhread_h
    97.9 +#ifndef SDL_systhread_h_
   97.10 +#define SDL_systhread_h_
   97.11  
   97.12  #include "SDL_thread.h"
   97.13  #include "SDL_thread_c.h"
   97.14 @@ -65,6 +65,6 @@
   97.15  SDL_CreateThreadInternal(int (SDLCALL * fn) (void *), const char *name,
   97.16                           const size_t stacksize, void *data);
   97.17  
   97.18 -#endif /* _SDL_systhread_h */
   97.19 +#endif /* SDL_systhread_h_ */
   97.20  
   97.21  /* vi: set ts=4 sw=4 expandtab: */
    98.1 --- a/src/thread/SDL_thread_c.h	Sun Nov 20 21:29:27 2016 -0800
    98.2 +++ b/src/thread/SDL_thread_c.h	Sun Nov 20 21:34:54 2016 -0800
    98.3 @@ -20,8 +20,8 @@
    98.4  */
    98.5  #include "../SDL_internal.h"
    98.6  
    98.7 -#ifndef _SDL_thread_c_h
    98.8 -#define _SDL_thread_c_h
    98.9 +#ifndef SDL_thread_c_h_
   98.10 +#define SDL_thread_c_h_
   98.11  
   98.12  #include "SDL_thread.h"
   98.13  
   98.14 @@ -90,6 +90,6 @@
   98.15   */
   98.16  extern int SDL_Generic_SetTLSData(SDL_TLSData *data);
   98.17  
   98.18 -#endif /* _SDL_thread_c_h */
   98.19 +#endif /* SDL_thread_c_h_ */
   98.20  
   98.21  /* vi: set ts=4 sw=4 expandtab: */
    99.1 --- a/src/thread/pthread/SDL_sysmutex_c.h	Sun Nov 20 21:29:27 2016 -0800
    99.2 +++ b/src/thread/pthread/SDL_sysmutex_c.h	Sun Nov 20 21:34:54 2016 -0800
    99.3 @@ -20,13 +20,13 @@
    99.4  */
    99.5  #include "../../SDL_internal.h"
    99.6  
    99.7 -#ifndef _SDL_mutex_c_h
    99.8 -#define _SDL_mutex_c_h
    99.9 +#ifndef SDL_mutex_c_h_
   99.10 +#define SDL_mutex_c_h_
   99.11  
   99.12  struct SDL_mutex
   99.13  {
   99.14      pthread_mutex_t id;
   99.15  };
   99.16  
   99.17 -#endif /* _SDL_mutex_c_h */
   99.18 +#endif /* SDL_mutex_c_h_ */
   99.19  /* vi: set ts=4 sw=4 expandtab: */
   100.1 --- a/src/video/SDL_blit.h	Sun Nov 20 21:29:27 2016 -0800
   100.2 +++ b/src/video/SDL_blit.h	Sun Nov 20 21:34:54 2016 -0800
   100.3 @@ -20,8 +20,8 @@
   100.4  */
   100.5  #include "../SDL_internal.h"
   100.6  
   100.7 -#ifndef _SDL_blit_h
   100.8 -#define _SDL_blit_h
   100.9 +#ifndef SDL_blit_h_
  100.10 +#define SDL_blit_h_
  100.11  
  100.12  #include "SDL_cpuinfo.h"
  100.13  #include "SDL_endian.h"
  100.14 @@ -547,6 +547,6 @@
  100.15  #pragma warning(disable: 4550)
  100.16  #endif
  100.17  
  100.18 -#endif /* _SDL_blit_h */
  100.19 +#endif /* SDL_blit_h_ */
  100.20  
  100.21  /* vi: set ts=4 sw=4 expandtab: */
   101.1 --- a/src/video/SDL_egl_c.h	Sun Nov 20 21:29:27 2016 -0800
   101.2 +++ b/src/video/SDL_egl_c.h	Sun Nov 20 21:34:54 2016 -0800
   101.3 @@ -20,8 +20,8 @@
   101.4  */
   101.5  #include "../SDL_internal.h"
   101.6  
   101.7 -#ifndef _SDL_egl_h
   101.8 -#define _SDL_egl_h
   101.9 +#ifndef SDL_egl_h_
  101.10 +#define SDL_egl_h_
  101.11  
  101.12  #if SDL_VIDEO_OPENGL_EGL
  101.13  
  101.14 @@ -125,6 +125,6 @@
  101.15  
  101.16  #endif /* SDL_VIDEO_OPENGL_EGL */
  101.17  
  101.18 -#endif /* _SDL_egl_h */
  101.19 +#endif /* SDL_egl_h_ */
  101.20  
  101.21  /* vi: set ts=4 sw=4 expandtab: */
   102.1 --- a/src/video/SDL_shape_internals.h	Sun Nov 20 21:29:27 2016 -0800
   102.2 +++ b/src/video/SDL_shape_internals.h	Sun Nov 20 21:34:54 2016 -0800
   102.3 @@ -20,8 +20,8 @@
   102.4  */
   102.5  #include "../SDL_internal.h"
   102.6  
   102.7 -#ifndef _SDL_shape_internals_h
   102.8 -#define _SDL_shape_internals_h
   102.9 +#ifndef SDL_shape_internals_h_
  102.10 +#define SDL_shape_internals_h_
  102.11  
  102.12  #include "SDL_rect.h"
  102.13  #include "SDL_shape.h"
   103.1 --- a/src/video/SDL_sysvideo.h	Sun Nov 20 21:29:27 2016 -0800
   103.2 +++ b/src/video/SDL_sysvideo.h	Sun Nov 20 21:34:54 2016 -0800
   103.3 @@ -20,8 +20,8 @@
   103.4  */
   103.5  #include "../SDL_internal.h"
   103.6  
   103.7 -#ifndef _SDL_sysvideo_h
   103.8 -#define _SDL_sysvideo_h
   103.9 +#ifndef SDL_sysvideo_h_
  103.10 +#define SDL_sysvideo_h_
  103.11  
  103.12  #include "SDL_messagebox.h"
  103.13  #include "SDL_shape.h"
  103.14 @@ -443,6 +443,6 @@
  103.15  
  103.16  extern float SDL_ComputeDiagonalDPI(int hpix, int vpix, float hinches, float vinches);
  103.17  
  103.18 -#endif /* _SDL_sysvideo_h */
  103.19 +#endif /* SDL_sysvideo_h_ */
  103.20  
  103.21  /* vi: set ts=4 sw=4 expandtab: */
   104.1 --- a/src/video/dummy/SDL_nullvideo.h	Sun Nov 20 21:29:27 2016 -0800
   104.2 +++ b/src/video/dummy/SDL_nullvideo.h	Sun Nov 20 21:34:54 2016 -0800
   104.3 @@ -20,11 +20,11 @@
   104.4  */
   104.5  #include "../../SDL_internal.h"
   104.6  
   104.7 -#ifndef _SDL_nullvideo_h
   104.8 -#define _SDL_nullvideo_h
   104.9 +#ifndef SDL_nullvideo_h_
  104.10 +#define SDL_nullvideo_h_
  104.11  
  104.12  #include "../SDL_sysvideo.h"
  104.13  
  104.14 -#endif /* _SDL_nullvideo_h */
  104.15 +#endif /* SDL_nullvideo_h_ */
  104.16  
  104.17  /* vi: set ts=4 sw=4 expandtab: */
   105.1 --- a/src/video/x11/SDL_x11clipboard.h	Sun Nov 20 21:29:27 2016 -0800
   105.2 +++ b/src/video/x11/SDL_x11clipboard.h	Sun Nov 20 21:34:54 2016 -0800
   105.3 @@ -20,14 +20,14 @@
   105.4  */
   105.5  #include "../../SDL_internal.h"
   105.6  
   105.7 -#ifndef _SDL_x11clipboard_h
   105.8 -#define _SDL_x11clipboard_h
   105.9 +#ifndef SDL_x11clipboard_h_
  105.10 +#define SDL_x11clipboard_h_
  105.11  
  105.12  extern int X11_SetClipboardText(_THIS, const char *text);
  105.13  extern char *X11_GetClipboardText(_THIS);
  105.14  extern SDL_bool X11_HasClipboardText(_THIS);
  105.15  extern Atom X11_GetSDLCutBufferClipboardType(Display *display);
  105.16  
  105.17 -#endif /* _SDL_x11clipboard_h */
  105.18 +#endif /* SDL_x11clipboard_h_ */
  105.19  
  105.20  /* vi: set ts=4 sw=4 expandtab: */
   106.1 --- a/src/video/x11/SDL_x11dyn.h	Sun Nov 20 21:29:27 2016 -0800
   106.2 +++ b/src/video/x11/SDL_x11dyn.h	Sun Nov 20 21:34:54 2016 -0800
   106.3 @@ -20,8 +20,8 @@
   106.4  */
   106.5  #include "../../SDL_internal.h"
   106.6  
   106.7 -#ifndef _SDL_x11dyn_h
   106.8 -#define _SDL_x11dyn_h
   106.9 +#ifndef SDL_x11dyn_h_
  106.10 +#define SDL_x11dyn_h_
  106.11  
  106.12  #include <X11/Xlib.h>
  106.13  #include <X11/Xutil.h>
  106.14 @@ -107,5 +107,5 @@
  106.15  }
  106.16  #endif
  106.17  
  106.18 -#endif                          /* !defined _SDL_x11dyn_h */
  106.19 +#endif                          /* !defined SDL_x11dyn_h_ */
  106.20  /* vi: set ts=4 sw=4 expandtab: */
   107.1 --- a/src/video/x11/SDL_x11events.h	Sun Nov 20 21:29:27 2016 -0800
   107.2 +++ b/src/video/x11/SDL_x11events.h	Sun Nov 20 21:34:54 2016 -0800
   107.3 @@ -20,12 +20,12 @@
   107.4  */
   107.5  #include "../../SDL_internal.h"
   107.6  
   107.7 -#ifndef _SDL_x11events_h
   107.8 -#define _SDL_x11events_h
   107.9 +#ifndef SDL_x11events_h_
  107.10 +#define SDL_x11events_h_
  107.11  
  107.12  extern void X11_PumpEvents(_THIS);
  107.13  extern void X11_SuspendScreenSaver(_THIS);
  107.14  
  107.15 -#endif /* _SDL_x11events_h */
  107.16 +#endif /* SDL_x11events_h_ */
  107.17  
  107.18  /* vi: set ts=4 sw=4 expandtab: */
   108.1 --- a/src/video/x11/SDL_x11keyboard.h	Sun Nov 20 21:29:27 2016 -0800
   108.2 +++ b/src/video/x11/SDL_x11keyboard.h	Sun Nov 20 21:34:54 2016 -0800
   108.3 @@ -20,8 +20,8 @@
   108.4  */
   108.5  #include "../../SDL_internal.h"
   108.6  
   108.7 -#ifndef _SDL_x11keyboard_h
   108.8 -#define _SDL_x11keyboard_h
   108.9 +#ifndef SDL_x11keyboard_h_
  108.10 +#define SDL_x11keyboard_h_
  108.11  
  108.12  extern int X11_InitKeyboard(_THIS);
  108.13  extern void X11_UpdateKeymap(_THIS);
  108.14 @@ -31,6 +31,6 @@
  108.15  extern void X11_SetTextInputRect(_THIS, SDL_Rect *rect);
  108.16  extern KeySym X11_KeyCodeToSym(_THIS, KeyCode, unsigned char group);
  108.17  
  108.18 -#endif /* _SDL_x11keyboard_h */
  108.19 +#endif /* SDL_x11keyboard_h_ */
  108.20  
  108.21  /* vi: set ts=4 sw=4 expandtab: */
   109.1 --- a/src/video/x11/SDL_x11modes.h	Sun Nov 20 21:29:27 2016 -0800
   109.2 +++ b/src/video/x11/SDL_x11modes.h	Sun Nov 20 21:34:54 2016 -0800
   109.3 @@ -20,8 +20,8 @@
   109.4  */
   109.5  #include "../../SDL_internal.h"
   109.6  
   109.7 -#ifndef _SDL_x11modes_h
   109.8 -#define _SDL_x11modes_h
   109.9 +#ifndef SDL_x11modes_h_
  109.10 +#define SDL_x11modes_h_
  109.11  
  109.12  typedef struct
  109.13  {
  109.14 @@ -80,6 +80,6 @@
  109.15  extern int X11_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect);
  109.16  extern int X11_GetDisplayDPI(_THIS, SDL_VideoDisplay * sdl_display, float * ddpi, float * hdpi, float * vdpi);
  109.17  
  109.18 -#endif /* _SDL_x11modes_h */
  109.19 +#endif /* SDL_x11modes_h_ */
  109.20  
  109.21  /* vi: set ts=4 sw=4 expandtab: */
   110.1 --- a/src/video/x11/SDL_x11mouse.h	Sun Nov 20 21:29:27 2016 -0800
   110.2 +++ b/src/video/x11/SDL_x11mouse.h	Sun Nov 20 21:34:54 2016 -0800
   110.3 @@ -20,12 +20,12 @@
   110.4  */
   110.5  #include "../../SDL_internal.h"
   110.6  
   110.7 -#ifndef _SDL_x11mouse_h
   110.8 -#define _SDL_x11mouse_h
   110.9 +#ifndef SDL_x11mouse_h_
  110.10 +#define SDL_x11mouse_h_
  110.11  
  110.12  extern void X11_InitMouse(_THIS);
  110.13  extern void X11_QuitMouse(_THIS);
  110.14  
  110.15 -#endif /* _SDL_x11mouse_h */
  110.16 +#endif /* SDL_x11mouse_h_ */
  110.17  
  110.18  /* vi: set ts=4 sw=4 expandtab: */
   111.1 --- a/src/video/x11/SDL_x11opengl.h	Sun Nov 20 21:29:27 2016 -0800
   111.2 +++ b/src/video/x11/SDL_x11opengl.h	Sun Nov 20 21:34:54 2016 -0800
   111.3 @@ -20,8 +20,8 @@
   111.4  */
   111.5  #include "../../SDL_internal.h"
   111.6  
   111.7 -#ifndef _SDL_x11opengl_h
   111.8 -#define _SDL_x11opengl_h
   111.9 +#ifndef SDL_x11opengl_h_
  111.10 +#define SDL_x11opengl_h_
  111.11  
  111.12  #if SDL_VIDEO_OPENGL_GLX
  111.13  #include "SDL_opengl.h"
  111.14 @@ -68,6 +68,6 @@
  111.15  
  111.16  #endif /* SDL_VIDEO_OPENGL_GLX */
  111.17  
  111.18 -#endif /* _SDL_x11opengl_h */
  111.19 +#endif /* SDL_x11opengl_h_ */
  111.20  
  111.21  /* vi: set ts=4 sw=4 expandtab: */
   112.1 --- a/src/video/x11/SDL_x11opengles.h	Sun Nov 20 21:29:27 2016 -0800
   112.2 +++ b/src/video/x11/SDL_x11opengles.h	Sun Nov 20 21:34:54 2016 -0800
   112.3 @@ -20,8 +20,8 @@
   112.4  */
   112.5  #include "../../SDL_internal.h"
   112.6  
   112.7 -#ifndef _SDL_x11opengles_h
   112.8 -#define _SDL_x11opengles_h
   112.9 +#ifndef SDL_x11opengles_h_
  112.10 +#define SDL_x11opengles_h_
  112.11  
  112.12  #if SDL_VIDEO_OPENGL_EGL
  112.13  
  112.14 @@ -51,6 +51,6 @@
  112.15  
  112.16  #endif /* SDL_VIDEO_OPENGL_EGL */
  112.17  
  112.18 -#endif /* _SDL_x11opengles_h */
  112.19 +#endif /* SDL_x11opengles_h_ */
  112.20  
  112.21  /* vi: set ts=4 sw=4 expandtab: */
   113.1 --- a/src/video/x11/SDL_x11shape.h	Sun Nov 20 21:29:27 2016 -0800
   113.2 +++ b/src/video/x11/SDL_x11shape.h	Sun Nov 20 21:34:54 2016 -0800
   113.3 @@ -20,8 +20,8 @@
   113.4  */
   113.5  #include "../../SDL_internal.h"
   113.6  
   113.7 -#ifndef _SDL_x11shape_h
   113.8 -#define _SDL_x11shape_h
   113.9 +#ifndef SDL_x11shape_h_
  113.10 +#define SDL_x11shape_h_
  113.11  
  113.12  #include "SDL_video.h"
  113.13  #include "SDL_shape.h"
  113.14 @@ -37,4 +37,4 @@
  113.15  extern int X11_ResizeWindowShape(SDL_Window* window);
  113.16  extern int X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode);
  113.17  
  113.18 -#endif /* _SDL_x11shape_h */
  113.19 +#endif /* SDL_x11shape_h_ */
   114.1 --- a/src/video/x11/SDL_x11touch.h	Sun Nov 20 21:29:27 2016 -0800
   114.2 +++ b/src/video/x11/SDL_x11touch.h	Sun Nov 20 21:34:54 2016 -0800
   114.3 @@ -20,12 +20,12 @@
   114.4  */
   114.5  #include "../../SDL_internal.h"
   114.6  
   114.7 -#ifndef _SDL_x11touch_h
   114.8 -#define _SDL_x11touch_h
   114.9 +#ifndef SDL_x11touch_h_
  114.10 +#define SDL_x11touch_h_
  114.11  
  114.12  extern void X11_InitTouch(_THIS);
  114.13  extern void X11_QuitTouch(_THIS);
  114.14  
  114.15 -#endif /* _SDL_x11touch_h */
  114.16 +#endif /* SDL_x11touch_h_ */
  114.17  
  114.18  /* vi: set ts=4 sw=4 expandtab: */
   115.1 --- a/src/video/x11/SDL_x11video.h	Sun Nov 20 21:29:27 2016 -0800
   115.2 +++ b/src/video/x11/SDL_x11video.h	Sun Nov 20 21:34:54 2016 -0800
   115.3 @@ -20,8 +20,8 @@
   115.4  */
   115.5  #include "../../SDL_internal.h"
   115.6  
   115.7 -#ifndef _SDL_x11video_h
   115.8 -#define _SDL_x11video_h
   115.9 +#ifndef SDL_x11video_h_
  115.10 +#define SDL_x11video_h_
  115.11  
  115.12  #include "SDL_keycode.h"
  115.13  
  115.14 @@ -141,6 +141,6 @@
  115.15  
  115.16  extern SDL_bool X11_UseDirectColorVisuals(void);
  115.17  
  115.18 -#endif /* _SDL_x11video_h */
  115.19 +#endif /* SDL_x11video_h_ */
  115.20  
  115.21  /* vi: set ts=4 sw=4 expandtab: */
   116.1 --- a/src/video/x11/SDL_x11window.h	Sun Nov 20 21:29:27 2016 -0800
   116.2 +++ b/src/video/x11/SDL_x11window.h	Sun Nov 20 21:34:54 2016 -0800
   116.3 @@ -20,8 +20,8 @@
   116.4  */
   116.5  #include "../../SDL_internal.h"
   116.6  
   116.7 -#ifndef _SDL_x11window_h
   116.8 -#define _SDL_x11window_h
   116.9 +#ifndef SDL_x11window_h_
  116.10 +#define SDL_x11window_h_
  116.11  
  116.12  /* We need to queue the focus in/out changes because they may occur during
  116.13     video mode changes and we can respond to them by triggering more mode
  116.14 @@ -105,6 +105,6 @@
  116.15                                      struct SDL_SysWMinfo *info);
  116.16  extern int X11_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
  116.17  
  116.18 -#endif /* _SDL_x11window_h */
  116.19 +#endif /* SDL_x11window_h_ */
  116.20  
  116.21  /* vi: set ts=4 sw=4 expandtab: */
   117.1 --- a/src/video/x11/SDL_x11xinput2.h	Sun Nov 20 21:29:27 2016 -0800
   117.2 +++ b/src/video/x11/SDL_x11xinput2.h	Sun Nov 20 21:34:54 2016 -0800
   117.3 @@ -20,8 +20,8 @@
   117.4  */
   117.5  #include "../../SDL_internal.h"
   117.6  
   117.7 -#ifndef _SDL_x11xinput2_h
   117.8 -#define _SDL_x11xinput2_h
   117.9 +#ifndef SDL_x11xinput2_h_
  117.10 +#define SDL_x11xinput2_h_
  117.11  
  117.12  #ifndef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
  117.13  /* Define XGenericEventCookie as forward declaration when
  117.14 @@ -37,6 +37,6 @@
  117.15  extern int X11_Xinput2IsMultitouchSupported(void);
  117.16  extern void X11_Xinput2SelectTouch(_THIS, SDL_Window *window);
  117.17  
  117.18 -#endif /* _SDL_x11xinput2_h */
  117.19 +#endif /* SDL_x11xinput2_h_ */
  117.20  
  117.21  /* vi: set ts=4 sw=4 expandtab: */