Renaming of guard header names to quiet -Wreserved-id-macro
authorSam Lantinga <slouken@libsdl.org>
Mon, 28 Aug 2017 00:22:23 -0700
changeset 113822c50e79b19e0
parent 11381 2610f8f0a9c6
child 11383 6cafb5954aaf
Renaming of guard header names to quiet -Wreserved-id-macro
src/audio/android/SDL_androidaudio.h
src/audio/arts/SDL_artsaudio.h
src/audio/coreaudio/SDL_coreaudio.h
src/audio/directsound/SDL_directsound.h
src/audio/emscripten/SDL_emscriptenaudio.h
src/audio/esd/SDL_esdaudio.h
src/audio/fusionsound/SDL_fsaudio.h
src/audio/haiku/SDL_haikuaudio.h
src/audio/jack/SDL_jackaudio.h
src/audio/nacl/SDL_naclaudio.h
src/audio/netbsd/SDL_netbsdaudio.h
src/audio/paudio/SDL_paudio.h
src/audio/psp/SDL_pspaudio.h
src/audio/sndio/SDL_sndioaudio.h
src/audio/sun/SDL_sunaudio.h
src/audio/winmm/SDL_winmm.h
src/audio/xaudio2/SDL_xaudio2.h
src/core/windows/SDL_directx.h
src/core/windows/SDL_xinput.h
src/core/winrt/SDL_winrtapp_common.h
src/core/winrt/SDL_winrtapp_xaml.h
src/haptic/windows/SDL_windowshaptic_c.h
src/joystick/android/SDL_sysjoystick_c.h
src/thread/windows/SDL_systhread_c.h
src/video/android/SDL_androidclipboard.h
src/video/android/SDL_androidgl.h
src/video/android/SDL_androidmouse.h
src/video/android/SDL_androidvideo.h
src/video/android/SDL_androidvulkan.h
src/video/android/SDL_androidwindow.h
src/video/cocoa/SDL_cocoaclipboard.h
src/video/cocoa/SDL_cocoaevents.h
src/video/cocoa/SDL_cocoakeyboard.h
src/video/cocoa/SDL_cocoametalview.h
src/video/cocoa/SDL_cocoamodes.h
src/video/cocoa/SDL_cocoamouse.h
src/video/cocoa/SDL_cocoamousetap.h
src/video/cocoa/SDL_cocoaopengl.h
src/video/cocoa/SDL_cocoashape.h
src/video/cocoa/SDL_cocoavideo.h
src/video/cocoa/SDL_cocoavulkan.h
src/video/cocoa/SDL_cocoawindow.h
src/video/directfb/SDL_DirectFB_WM.h
src/video/directfb/SDL_DirectFB_dyn.h
src/video/directfb/SDL_DirectFB_events.h
src/video/directfb/SDL_DirectFB_modes.h
src/video/directfb/SDL_DirectFB_mouse.h
src/video/directfb/SDL_DirectFB_opengl.h
src/video/directfb/SDL_DirectFB_shape.h
src/video/directfb/SDL_DirectFB_video.h
src/video/directfb/SDL_DirectFB_window.h
src/video/emscripten/SDL_emscriptenevents.h
src/video/emscripten/SDL_emscriptenframebuffer.h
src/video/emscripten/SDL_emscriptenmouse.h
src/video/emscripten/SDL_emscriptenopengles.h
src/video/emscripten/SDL_emscriptenvideo.h
src/video/haiku/SDL_BWin.h
src/video/kmsdrm/SDL_kmsdrmdyn.h
src/video/kmsdrm/SDL_kmsdrmevents.h
src/video/kmsdrm/SDL_kmsdrmmouse.h
src/video/kmsdrm/SDL_kmsdrmopengles.h
src/video/mir/SDL_mirdyn.h
src/video/mir/SDL_mirevents.h
src/video/mir/SDL_mirframebuffer.h
src/video/mir/SDL_mirmouse.h
src/video/mir/SDL_miropengl.h
src/video/mir/SDL_mirvideo.h
src/video/mir/SDL_mirvulkan.h
src/video/mir/SDL_mirwindow.h
src/video/nacl/SDL_naclevents_c.h
src/video/nacl/SDL_naclopengles.h
src/video/nacl/SDL_naclvideo.h
src/video/nacl/SDL_naclwindow.h
src/video/psp/SDL_pspgl_c.h
src/video/psp/SDL_pspvideo.h
src/video/raspberry/SDL_rpievents_c.h
src/video/raspberry/SDL_rpimouse.h
src/video/raspberry/SDL_rpiopengles.h
src/video/uikit/SDL_uikitclipboard.h
src/video/uikit/SDL_uikitevents.h
src/video/uikit/SDL_uikitmetalview.h
src/video/uikit/SDL_uikitmodes.h
src/video/uikit/SDL_uikitopengles.h
src/video/uikit/SDL_uikitvideo.h
src/video/uikit/SDL_uikitvulkan.h
src/video/uikit/SDL_uikitwindow.h
src/video/vivante/SDL_vivanteopengles.h
src/video/vivante/SDL_vivanteplatform.h
src/video/vivante/SDL_vivantevideo.h
src/video/wayland/SDL_waylandclipboard.h
src/video/wayland/SDL_waylanddatamanager.h
src/video/wayland/SDL_waylanddyn.h
src/video/wayland/SDL_waylandevents_c.h
src/video/wayland/SDL_waylandopengles.h
src/video/wayland/SDL_waylandtouch.h
src/video/wayland/SDL_waylandvideo.h
src/video/wayland/SDL_waylandvulkan.h
src/video/wayland/SDL_waylandwindow.h
src/video/windows/SDL_msctf.h
src/video/windows/SDL_windowsclipboard.h
src/video/windows/SDL_windowsevents.h
src/video/windows/SDL_windowskeyboard.h
src/video/windows/SDL_windowsmodes.h
src/video/windows/SDL_windowsmouse.h
src/video/windows/SDL_windowsopengl.h
src/video/windows/SDL_windowsopengles.h
src/video/windows/SDL_windowsshape.h
src/video/windows/SDL_windowsvideo.h
src/video/windows/SDL_windowsvulkan.h
src/video/windows/SDL_windowswindow.h
src/video/winrt/SDL_winrtgamebar_cpp.h
src/video/winrt/SDL_winrtmouse_c.h
src/video/winrt/SDL_winrtopengles.h
src/video/x11/SDL_x11vulkan.h
visualtest/include/SDL_visualtest_action_configparser.h
visualtest/include/SDL_visualtest_exhaustive_variator.h
visualtest/include/SDL_visualtest_harness_argparser.h
visualtest/include/SDL_visualtest_mischelper.h
visualtest/include/SDL_visualtest_parsehelper.h
visualtest/include/SDL_visualtest_process.h
visualtest/include/SDL_visualtest_random_variator.h
visualtest/include/SDL_visualtest_rwhelper.h
visualtest/include/SDL_visualtest_screenshot.h
visualtest/include/SDL_visualtest_sut_configparser.h
visualtest/include/SDL_visualtest_variator_common.h
visualtest/include/SDL_visualtest_variators.h
     1.1 --- a/src/audio/android/SDL_androidaudio.h	Mon Aug 28 00:11:38 2017 -0700
     1.2 +++ b/src/audio/android/SDL_androidaudio.h	Mon Aug 28 00:22:23 2017 -0700
     1.3 @@ -20,8 +20,8 @@
     1.4  */
     1.5  #include "../../SDL_internal.h"
     1.6  
     1.7 -#ifndef _SDL_androidaudio_h
     1.8 -#define _SDL_androidaudio_h
     1.9 +#ifndef SDL_androidaudio_h_
    1.10 +#define SDL_androidaudio_h_
    1.11  
    1.12  #include "../SDL_sysaudio.h"
    1.13  
    1.14 @@ -37,6 +37,6 @@
    1.15  void ANDROIDAUDIO_ResumeDevices(void);
    1.16  void ANDROIDAUDIO_PauseDevices(void);
    1.17  
    1.18 -#endif /* _SDL_androidaudio_h */
    1.19 +#endif /* SDL_androidaudio_h_ */
    1.20  
    1.21  /* vi: set ts=4 sw=4 expandtab: */
     2.1 --- a/src/audio/arts/SDL_artsaudio.h	Mon Aug 28 00:11:38 2017 -0700
     2.2 +++ b/src/audio/arts/SDL_artsaudio.h	Mon Aug 28 00:22:23 2017 -0700
     2.3 @@ -20,8 +20,8 @@
     2.4  */
     2.5  #include "../../SDL_internal.h"
     2.6  
     2.7 -#ifndef _SDL_artsaudio_h
     2.8 -#define _SDL_artsaudio_h
     2.9 +#ifndef SDL_artsaudio_h_
    2.10 +#define SDL_artsaudio_h_
    2.11  
    2.12  #include <artsc.h>
    2.13  
    2.14 @@ -48,6 +48,6 @@
    2.15  };
    2.16  #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
    2.17  
    2.18 -#endif /* _SDL_artsaudio_h */
    2.19 +#endif /* SDL_artsaudio_h_ */
    2.20  
    2.21  /* vi: set ts=4 sw=4 expandtab: */
     3.1 --- a/src/audio/coreaudio/SDL_coreaudio.h	Mon Aug 28 00:11:38 2017 -0700
     3.2 +++ b/src/audio/coreaudio/SDL_coreaudio.h	Mon Aug 28 00:22:23 2017 -0700
     3.3 @@ -20,8 +20,8 @@
     3.4  */
     3.5  #include "../../SDL_internal.h"
     3.6  
     3.7 -#ifndef _SDL_coreaudio_h
     3.8 -#define _SDL_coreaudio_h
     3.9 +#ifndef SDL_coreaudio_h_
    3.10 +#define SDL_coreaudio_h_
    3.11  
    3.12  #include "../SDL_sysaudio.h"
    3.13  
    3.14 @@ -63,5 +63,6 @@
    3.15  #endif
    3.16  };
    3.17  
    3.18 -#endif /* _SDL_coreaudio_h */
    3.19 +#endif /* SDL_coreaudio_h_ */
    3.20 +
    3.21  /* vi: set ts=4 sw=4 expandtab: */
     4.1 --- a/src/audio/directsound/SDL_directsound.h	Mon Aug 28 00:11:38 2017 -0700
     4.2 +++ b/src/audio/directsound/SDL_directsound.h	Mon Aug 28 00:22:23 2017 -0700
     4.3 @@ -20,8 +20,8 @@
     4.4  */
     4.5  #include "../../SDL_internal.h"
     4.6  
     4.7 -#ifndef _SDL_directsound_h
     4.8 -#define _SDL_directsound_h
     4.9 +#ifndef SDL_directsound_h_
    4.10 +#define SDL_directsound_h_
    4.11  
    4.12  #include "../../core/windows/SDL_directx.h"
    4.13  
    4.14 @@ -42,6 +42,6 @@
    4.15      Uint8 *locked_buf;
    4.16  };
    4.17  
    4.18 -#endif /* _SDL_directsound_h */
    4.19 +#endif /* SDL_directsound_h_ */
    4.20  
    4.21  /* vi: set ts=4 sw=4 expandtab: */
     5.1 --- a/src/audio/emscripten/SDL_emscriptenaudio.h	Mon Aug 28 00:11:38 2017 -0700
     5.2 +++ b/src/audio/emscripten/SDL_emscriptenaudio.h	Mon Aug 28 00:22:23 2017 -0700
     5.3 @@ -20,8 +20,8 @@
     5.4  */
     5.5  #include "../../SDL_internal.h"
     5.6  
     5.7 -#ifndef _SDL_emscriptenaudio_h
     5.8 -#define _SDL_emscriptenaudio_h
     5.9 +#ifndef SDL_emscriptenaudio_h_
    5.10 +#define SDL_emscriptenaudio_h_
    5.11  
    5.12  #include "../SDL_sysaudio.h"
    5.13  
    5.14 @@ -33,5 +33,6 @@
    5.15      int unused;
    5.16  };
    5.17  
    5.18 -#endif /* _SDL_emscriptenaudio_h */
    5.19 +#endif /* SDL_emscriptenaudio_h_ */
    5.20 +
    5.21  /* vi: set ts=4 sw=4 expandtab: */
     6.1 --- a/src/audio/esd/SDL_esdaudio.h	Mon Aug 28 00:11:38 2017 -0700
     6.2 +++ b/src/audio/esd/SDL_esdaudio.h	Mon Aug 28 00:22:23 2017 -0700
     6.3 @@ -20,8 +20,8 @@
     6.4  */
     6.5  #include "../../SDL_internal.h"
     6.6  
     6.7 -#ifndef _SDL_esdaudio_h
     6.8 -#define _SDL_esdaudio_h
     6.9 +#ifndef SDL_esdaudio_h_
    6.10 +#define SDL_esdaudio_h_
    6.11  
    6.12  #include "../SDL_sysaudio.h"
    6.13  
    6.14 @@ -46,5 +46,6 @@
    6.15  };
    6.16  #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
    6.17  
    6.18 -#endif /* _SDL_esdaudio_h */
    6.19 +#endif /* SDL_esdaudio_h_ */
    6.20 +
    6.21  /* vi: set ts=4 sw=4 expandtab: */
     7.1 --- a/src/audio/fusionsound/SDL_fsaudio.h	Mon Aug 28 00:11:38 2017 -0700
     7.2 +++ b/src/audio/fusionsound/SDL_fsaudio.h	Mon Aug 28 00:22:23 2017 -0700
     7.3 @@ -20,8 +20,8 @@
     7.4  */
     7.5  #include "../../SDL_internal.h"
     7.6  
     7.7 -#ifndef _SDL_fsaudio_h
     7.8 -#define _SDL_fsaudio_h
     7.9 +#ifndef SDL_fsaudio_h_
    7.10 +#define SDL_fsaudio_h_
    7.11  
    7.12  #include <fusionsound/fusionsound.h>
    7.13  
    7.14 @@ -45,5 +45,6 @@
    7.15  
    7.16  };
    7.17  
    7.18 -#endif /* _SDL_fsaudio_h */
    7.19 +#endif /* SDL_fsaudio_h_ */
    7.20 +
    7.21  /* vi: set ts=4 sw=4 expandtab: */
     8.1 --- a/src/audio/haiku/SDL_haikuaudio.h	Mon Aug 28 00:11:38 2017 -0700
     8.2 +++ b/src/audio/haiku/SDL_haikuaudio.h	Mon Aug 28 00:22:23 2017 -0700
     8.3 @@ -20,8 +20,8 @@
     8.4  */
     8.5  #include "../../SDL_internal.h"
     8.6  
     8.7 -#ifndef _SDL_haikuaudio_h
     8.8 -#define _SDL_haikuaudio_h
     8.9 +#ifndef SDL_haikuaudio_h_
    8.10 +#define SDL_haikuaudio_h_
    8.11  
    8.12  #include "../SDL_sysaudio.h"
    8.13  
    8.14 @@ -33,6 +33,6 @@
    8.15      BSoundPlayer *audio_obj;
    8.16  };
    8.17  
    8.18 -#endif /* _SDL_haikuaudio_h */
    8.19 +#endif /* SDL_haikuaudio_h_ */
    8.20  
    8.21  /* vi: set ts=4 sw=4 expandtab: */
     9.1 --- a/src/audio/jack/SDL_jackaudio.h	Mon Aug 28 00:11:38 2017 -0700
     9.2 +++ b/src/audio/jack/SDL_jackaudio.h	Mon Aug 28 00:22:23 2017 -0700
     9.3 @@ -18,8 +18,8 @@
     9.4       misrepresented as being the original software.
     9.5    3. This notice may not be removed or altered from any source distribution.
     9.6  */
     9.7 -#ifndef _SDL_jackaudio_h
     9.8 -#define _SDL_jackaudio_h
     9.9 +#ifndef SDL_jackaudio_h_
    9.10 +#define SDL_jackaudio_h_
    9.11  
    9.12  #include <jack/jack.h>
    9.13  
    9.14 @@ -37,6 +37,6 @@
    9.15      jack_port_t **sdlports;
    9.16  };
    9.17  
    9.18 -#endif /* _SDL_jackaudio_h */
    9.19 +#endif /* SDL_jackaudio_h_ */
    9.20  
    9.21  /* vi: set ts=4 sw=4 expandtab: */
    10.1 --- a/src/audio/nacl/SDL_naclaudio.h	Mon Aug 28 00:11:38 2017 -0700
    10.2 +++ b/src/audio/nacl/SDL_naclaudio.h	Mon Aug 28 00:22:23 2017 -0700
    10.3 @@ -21,8 +21,8 @@
    10.4  
    10.5  #include "../../SDL_internal.h"
    10.6  
    10.7 -#ifndef _SDL_naclaudio_h
    10.8 -#define _SDL_naclaudio_h
    10.9 +#ifndef SDL_naclaudio_h_
   10.10 +#define SDL_naclaudio_h_
   10.11  
   10.12  #include "SDL_audio.h"
   10.13  #include "../SDL_sysaudio.h"
   10.14 @@ -38,4 +38,6 @@
   10.15    PP_Resource audio;
   10.16  } SDL_PrivateAudioData;
   10.17  
   10.18 -#endif /* _SDL_naclaudio_h */
   10.19 +#endif /* SDL_naclaudio_h_ */
   10.20 +
   10.21 +/* vi: set ts=4 sw=4 expandtab: */
    11.1 --- a/src/audio/netbsd/SDL_netbsdaudio.h	Mon Aug 28 00:11:38 2017 -0700
    11.2 +++ b/src/audio/netbsd/SDL_netbsdaudio.h	Mon Aug 28 00:22:23 2017 -0700
    11.3 @@ -20,8 +20,8 @@
    11.4  */
    11.5  #include "../../SDL_internal.h"
    11.6  
    11.7 -#ifndef _SDL_netbsdaudio_h
    11.8 -#define _SDL_netbsdaudio_h
    11.9 +#ifndef SDL_netbsdaudio_h_
   11.10 +#define SDL_netbsdaudio_h_
   11.11  
   11.12  #include "../SDL_sysaudio.h"
   11.13  
   11.14 @@ -43,6 +43,6 @@
   11.15  
   11.16  #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
   11.17  
   11.18 -#endif /* _SDL_netbsdaudio_h */
   11.19 +#endif /* SDL_netbsdaudio_h_ */
   11.20  
   11.21  /* vi: set ts=4 sw=4 expandtab: */
    12.1 --- a/src/audio/paudio/SDL_paudio.h	Mon Aug 28 00:11:38 2017 -0700
    12.2 +++ b/src/audio/paudio/SDL_paudio.h	Mon Aug 28 00:22:23 2017 -0700
    12.3 @@ -20,8 +20,8 @@
    12.4  */
    12.5  #include "../../SDL_internal.h"
    12.6  
    12.7 -#ifndef _SDL_paudio_h
    12.8 -#define _SDL_paudio_h
    12.9 +#ifndef SDL_paudio_h_
   12.10 +#define SDL_paudio_h_
   12.11  
   12.12  #include "../SDL_sysaudio.h"
   12.13  
   12.14 @@ -43,6 +43,6 @@
   12.15  };
   12.16  #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
   12.17  
   12.18 -#endif /* _SDL_paudio_h */
   12.19 +#endif /* SDL_paudio_h_ */
   12.20  
   12.21  /* vi: set ts=4 sw=4 expandtab: */
    13.1 --- a/src/audio/psp/SDL_pspaudio.h	Mon Aug 28 00:11:38 2017 -0700
    13.2 +++ b/src/audio/psp/SDL_pspaudio.h	Mon Aug 28 00:22:23 2017 -0700
    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_pspaudio_h
    13.8 -#define _SDL_pspaudio_h
    13.9 +#ifndef SDL_pspaudio_h_
   13.10 +#define SDL_pspaudio_h_
   13.11  
   13.12  #include "../SDL_sysaudio.h"
   13.13  
   13.14 @@ -40,6 +40,6 @@
   13.15      int     next_buffer;
   13.16  };
   13.17  
   13.18 -#endif /* _SDL_pspaudio_h */
   13.19 -/* vim: ts=4 sw=4
   13.20 - */
   13.21 +#endif /* SDL_pspaudio_h_ */
   13.22 +
   13.23 +/* vi: set ts=4 sw=4 expandtab: */
    14.1 --- a/src/audio/sndio/SDL_sndioaudio.h	Mon Aug 28 00:11:38 2017 -0700
    14.2 +++ b/src/audio/sndio/SDL_sndioaudio.h	Mon Aug 28 00:22:23 2017 -0700
    14.3 @@ -20,8 +20,8 @@
    14.4  */
    14.5  #include "../../SDL_internal.h"
    14.6  
    14.7 -#ifndef _SDL_sndioaudio_h
    14.8 -#define _SDL_sndioaudio_h
    14.9 +#ifndef SDL_sndioaudio_h_
   14.10 +#define SDL_sndioaudio_h_
   14.11  
   14.12  #include <poll.h>
   14.13  #include <sndio.h>
   14.14 @@ -44,6 +44,6 @@
   14.15      struct pollfd *pfd;
   14.16  };
   14.17  
   14.18 -#endif /* _SDL_sndioaudio_h */
   14.19 +#endif /* SDL_sndioaudio_h_ */
   14.20  
   14.21  /* vi: set ts=4 sw=4 expandtab: */
    15.1 --- a/src/audio/sun/SDL_sunaudio.h	Mon Aug 28 00:11:38 2017 -0700
    15.2 +++ b/src/audio/sun/SDL_sunaudio.h	Mon Aug 28 00:22:23 2017 -0700
    15.3 @@ -20,8 +20,8 @@
    15.4  */
    15.5  #include "../../SDL_internal.h"
    15.6  
    15.7 -#ifndef _SDL_sunaudio_h
    15.8 -#define _SDL_sunaudio_h
    15.9 +#ifndef SDL_sunaudio_h_
   15.10 +#define SDL_sunaudio_h_
   15.11  
   15.12  #include "../SDL_sysaudio.h"
   15.13  
   15.14 @@ -42,6 +42,6 @@
   15.15      int frequency;              /* The audio frequency in KHz */
   15.16  };
   15.17  
   15.18 -#endif /* _SDL_sunaudio_h */
   15.19 +#endif /* SDL_sunaudio_h_ */
   15.20  
   15.21  /* vi: set ts=4 sw=4 expandtab: */
    16.1 --- a/src/audio/winmm/SDL_winmm.h	Mon Aug 28 00:11:38 2017 -0700
    16.2 +++ b/src/audio/winmm/SDL_winmm.h	Mon Aug 28 00:22:23 2017 -0700
    16.3 @@ -20,8 +20,8 @@
    16.4  */
    16.5  #include "../../SDL_internal.h"
    16.6  
    16.7 -#ifndef _SDL_winmm_h
    16.8 -#define _SDL_winmm_h
    16.9 +#ifndef SDL_winmm_h_
   16.10 +#define SDL_winmm_h_
   16.11  
   16.12  #include "../SDL_sysaudio.h"
   16.13  
   16.14 @@ -40,6 +40,6 @@
   16.15      int next_buffer;
   16.16  };
   16.17  
   16.18 -#endif /* _SDL_winmm_h */
   16.19 +#endif /* SDL_winmm_h_ */
   16.20  
   16.21  /* vi: set ts=4 sw=4 expandtab: */
    17.1 --- a/src/audio/xaudio2/SDL_xaudio2.h	Mon Aug 28 00:11:38 2017 -0700
    17.2 +++ b/src/audio/xaudio2/SDL_xaudio2.h	Mon Aug 28 00:22:23 2017 -0700
    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_XAUDIO2_H
    17.8 -#define _SDL_XAUDIO2_H
    17.9 +#ifndef SDL_XAUDIO2_H_
   17.10 +#define SDL_XAUDIO2_H_
   17.11  
   17.12  #include <windows.h>
   17.13  #include <mmreg.h>
   17.14 @@ -381,6 +381,6 @@
   17.15  
   17.16  #pragma pack(pop)   /* Undo pragma push */
   17.17  
   17.18 -#endif  /* _SDL_XAUDIO2_H */
   17.19 +#endif  /* SDL_XAUDIO2_H_ */
   17.20  
   17.21  /* vi: set ts=4 sw=4 expandtab: */
    18.1 --- a/src/core/windows/SDL_directx.h	Mon Aug 28 00:11:38 2017 -0700
    18.2 +++ b/src/core/windows/SDL_directx.h	Mon Aug 28 00:22:23 2017 -0700
    18.3 @@ -20,8 +20,8 @@
    18.4  */
    18.5  #include "../../SDL_internal.h"
    18.6  
    18.7 -#ifndef _SDL_directx_h
    18.8 -#define _SDL_directx_h
    18.9 +#ifndef SDL_directx_h_
   18.10 +#define SDL_directx_h_
   18.11  
   18.12  /* Include all of the DirectX 8.0 headers and adds any necessary tweaks */
   18.13  
   18.14 @@ -106,6 +106,6 @@
   18.15  typedef struct { int unused; } DIDEVICEINSTANCE;
   18.16  #endif
   18.17  
   18.18 -#endif /* _SDL_directx_h */
   18.19 +#endif /* SDL_directx_h_ */
   18.20  
   18.21  /* vi: set ts=4 sw=4 expandtab: */
    19.1 --- a/src/core/windows/SDL_xinput.h	Mon Aug 28 00:11:38 2017 -0700
    19.2 +++ b/src/core/windows/SDL_xinput.h	Mon Aug 28 00:22:23 2017 -0700
    19.3 @@ -20,8 +20,8 @@
    19.4  */
    19.5  #include "../../SDL_internal.h"
    19.6  
    19.7 -#ifndef _SDL_xinput_h
    19.8 -#define _SDL_xinput_h
    19.9 +#ifndef SDL_xinput_h_
   19.10 +#define SDL_xinput_h_
   19.11  
   19.12  #ifdef HAVE_XINPUT_H
   19.13  
   19.14 @@ -172,6 +172,6 @@
   19.15  
   19.16  #endif /* HAVE_XINPUT_H */
   19.17  
   19.18 -#endif /* _SDL_xinput_h */
   19.19 +#endif /* SDL_xinput_h_ */
   19.20  
   19.21  /* vi: set ts=4 sw=4 expandtab: */
    20.1 --- a/src/core/winrt/SDL_winrtapp_common.h	Mon Aug 28 00:11:38 2017 -0700
    20.2 +++ b/src/core/winrt/SDL_winrtapp_common.h	Mon Aug 28 00:22:23 2017 -0700
    20.3 @@ -20,12 +20,12 @@
    20.4  */
    20.5  #include "SDL_config.h"
    20.6  
    20.7 -#ifndef _SDL_winrtapp_common_h
    20.8 -#define _SDL_winrtapp_common_h
    20.9 +#ifndef SDL_winrtapp_common_h_
   20.10 +#define SDL_winrtapp_common_h_
   20.11  
   20.12  /* A pointer to the app's C-style main() function (which is a different
   20.13     function than the WinRT app's actual entry point).
   20.14   */
   20.15  extern int (*WINRT_SDLAppEntryPoint)(int, char **);
   20.16  
   20.17 -#endif // ifndef _SDL_winrtapp_common_h
   20.18 +#endif // SDL_winrtapp_common_h_
    21.1 --- a/src/core/winrt/SDL_winrtapp_xaml.h	Mon Aug 28 00:11:38 2017 -0700
    21.2 +++ b/src/core/winrt/SDL_winrtapp_xaml.h	Mon Aug 28 00:22:23 2017 -0700
    21.3 @@ -20,8 +20,8 @@
    21.4  */
    21.5  #include "SDL_config.h"
    21.6  
    21.7 -#ifndef _SDL_winrtapp_xaml_h
    21.8 -#define _SDL_winrtapp_xaml_h
    21.9 +#ifndef SDL_winrtapp_xaml_h_
   21.10 +#define SDL_winrtapp_xaml_h_
   21.11  
   21.12  #include "SDL_stdinc.h"
   21.13  
   21.14 @@ -30,4 +30,4 @@
   21.15  extern int SDL_WinRTInitXAMLApp(int (*mainFunction)(int, char **), void * backgroundPanelAsIInspectable);
   21.16  #endif // ifdef __cplusplus
   21.17  
   21.18 -#endif // ifndef _SDL_winrtapp_xaml_h
   21.19 +#endif // SDL_winrtapp_xaml_h_
    22.1 --- a/src/haptic/windows/SDL_windowshaptic_c.h	Mon Aug 28 00:11:38 2017 -0700
    22.2 +++ b/src/haptic/windows/SDL_windowshaptic_c.h	Mon Aug 28 00:22:23 2017 -0700
    22.3 @@ -20,8 +20,8 @@
    22.4  */
    22.5  #include "../../SDL_internal.h"
    22.6  
    22.7 -#ifndef _SDL_windowshaptic_c_h
    22.8 -#define _SDL_windowshaptic_c_h
    22.9 +#ifndef SDL_windowshaptic_c_h_
   22.10 +#define SDL_windowshaptic_c_h_
   22.11  
   22.12  #include "SDL_thread.h"
   22.13  #include "../SDL_syshaptic.h"
   22.14 @@ -82,7 +82,7 @@
   22.15  extern int SDL_SYS_AddHapticDevice(SDL_hapticlist_item *item);
   22.16  extern int SDL_SYS_RemoveHapticDevice(SDL_hapticlist_item *prev, SDL_hapticlist_item *item);
   22.17  
   22.18 -#endif /* _SDL_windowshaptic_c_h */
   22.19 +#endif /* SDL_windowshaptic_c_h_ */
   22.20  
   22.21  /* vi: set ts=4 sw=4 expandtab: */
   22.22  
    23.1 --- a/src/joystick/android/SDL_sysjoystick_c.h	Mon Aug 28 00:11:38 2017 -0700
    23.2 +++ b/src/joystick/android/SDL_sysjoystick_c.h	Mon Aug 28 00:22:23 2017 -0700
    23.3 @@ -23,8 +23,8 @@
    23.4  
    23.5  #ifdef SDL_JOYSTICK_ANDROID
    23.6  
    23.7 -#ifndef _SDL_sysjoystick_c_h
    23.8 -#define _SDL_sysjoystick_c_h
    23.9 +#ifndef SDL_sysjoystick_c_h_
   23.10 +#define SDL_sysjoystick_c_h_
   23.11  
   23.12  #include "../SDL_sysjoystick.h"
   23.13  
   23.14 @@ -51,7 +51,7 @@
   23.15  
   23.16  typedef SDL_joylist_item joystick_hwdata;
   23.17  
   23.18 -#endif /* _SDL_sysjoystick_c_h */
   23.19 +#endif /* SDL_sysjoystick_c_h_ */
   23.20  
   23.21  #endif /* SDL_JOYSTICK_ANDROID */
   23.22  
    24.1 --- a/src/thread/windows/SDL_systhread_c.h	Mon Aug 28 00:11:38 2017 -0700
    24.2 +++ b/src/thread/windows/SDL_systhread_c.h	Mon Aug 28 00:22:23 2017 -0700
    24.3 @@ -20,13 +20,13 @@
    24.4  */
    24.5  #include "../../SDL_internal.h"
    24.6  
    24.7 -#ifndef _SDL_systhread_c_h
    24.8 -#define _SDL_systhread_c_h
    24.9 +#ifndef SDL_systhread_c_h_
   24.10 +#define SDL_systhread_c_h_
   24.11  
   24.12  #include "../../core/windows/SDL_windows.h"
   24.13  
   24.14  typedef HANDLE SYS_ThreadHandle;
   24.15  
   24.16 -#endif /* _SDL_systhread_c_h */
   24.17 +#endif /* SDL_systhread_c_h_ */
   24.18  
   24.19  /* vi: set ts=4 sw=4 expandtab: */
    25.1 --- a/src/video/android/SDL_androidclipboard.h	Mon Aug 28 00:11:38 2017 -0700
    25.2 +++ b/src/video/android/SDL_androidclipboard.h	Mon Aug 28 00:22:23 2017 -0700
    25.3 @@ -20,13 +20,13 @@
    25.4  */
    25.5  #include "../../SDL_internal.h"
    25.6  
    25.7 -#ifndef _SDL_androidclipboard_h
    25.8 -#define _SDL_androidclipboard_h
    25.9 +#ifndef SDL_androidclipboard_h_
   25.10 +#define SDL_androidclipboard_h_
   25.11  
   25.12  extern int Android_SetClipboardText(_THIS, const char *text);
   25.13  extern char *Android_GetClipboardText(_THIS);
   25.14  extern SDL_bool Android_HasClipboardText(_THIS);
   25.15  
   25.16 -#endif /* _SDL_androidclipboard_h */
   25.17 +#endif /* SDL_androidclipboard_h_ */
   25.18  
   25.19  /* vi: set ts=4 sw=4 expandtab: */
    26.1 --- a/src/video/android/SDL_androidgl.h	Mon Aug 28 00:11:38 2017 -0700
    26.2 +++ b/src/video/android/SDL_androidgl.h	Mon Aug 28 00:22:23 2017 -0700
    26.3 @@ -20,8 +20,8 @@
    26.4  */
    26.5  #include "../../SDL_internal.h"
    26.6  
    26.7 -#ifndef _SDL_androidgl_h
    26.8 -#define _SDL_androidgl_h
    26.9 +#ifndef SDL_androidgl_h_
   26.10 +#define SDL_androidgl_h_
   26.11  
   26.12  SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window);
   26.13  int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
   26.14 @@ -29,6 +29,6 @@
   26.15  int Android_GLES_LoadLibrary(_THIS, const char *path);
   26.16  
   26.17  
   26.18 -#endif /* _SDL_androidgl_h */
   26.19 +#endif /* SDL_androidgl_h_ */
   26.20  
   26.21  /* vi: set ts=4 sw=4 expandtab: */
    27.1 --- a/src/video/android/SDL_androidmouse.h	Mon Aug 28 00:11:38 2017 -0700
    27.2 +++ b/src/video/android/SDL_androidmouse.h	Mon Aug 28 00:22:23 2017 -0700
    27.3 @@ -19,14 +19,14 @@
    27.4    3. This notice may not be removed or altered from any source distribution.
    27.5  */
    27.6  
    27.7 -#ifndef _SDL_androidmouse_h
    27.8 -#define _SDL_androidmouse_h
    27.9 +#ifndef SDL_androidmouse_h_
   27.10 +#define SDL_androidmouse_h_
   27.11  
   27.12  #include "SDL_androidvideo.h"
   27.13  
   27.14  extern void Android_InitMouse(void);
   27.15  extern void Android_OnMouse( int button, int action, float x, float y);
   27.16  
   27.17 -#endif /* _SDL_androidmouse_h */
   27.18 +#endif /* SDL_androidmouse_h_ */
   27.19  
   27.20  /* vi: set ts=4 sw=4 expandtab: */
    28.1 --- a/src/video/android/SDL_androidvideo.h	Mon Aug 28 00:11:38 2017 -0700
    28.2 +++ b/src/video/android/SDL_androidvideo.h	Mon Aug 28 00:22:23 2017 -0700
    28.3 @@ -20,8 +20,8 @@
    28.4  */
    28.5  #include "../../SDL_internal.h"
    28.6  
    28.7 -#ifndef _SDL_androidvideo_h
    28.8 -#define _SDL_androidvideo_h
    28.9 +#ifndef SDL_androidvideo_h_
   28.10 +#define SDL_androidvideo_h_
   28.11  
   28.12  #include "SDL_mutex.h"
   28.13  #include "SDL_rect.h"
   28.14 @@ -44,6 +44,6 @@
   28.15  extern SDL_Window *Android_Window;
   28.16  
   28.17  
   28.18 -#endif /* _SDL_androidvideo_h */
   28.19 +#endif /* SDL_androidvideo_h_ */
   28.20  
   28.21  /* vi: set ts=4 sw=4 expandtab: */
    29.1 --- a/src/video/android/SDL_androidvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    29.2 +++ b/src/video/android/SDL_androidvulkan.h	Mon Aug 28 00:22:23 2017 -0700
    29.3 @@ -26,8 +26,8 @@
    29.4  
    29.5  #include "../../SDL_internal.h"
    29.6  
    29.7 -#ifndef _SDL_androidvulkan_h
    29.8 -#define _SDL_androidvulkan_h
    29.9 +#ifndef SDL_androidvulkan_h_
   29.10 +#define SDL_androidvulkan_h_
   29.11  
   29.12  #include "../SDL_vulkan_internal.h"
   29.13  #include "../SDL_sysvideo.h"
   29.14 @@ -47,6 +47,6 @@
   29.15  
   29.16  #endif
   29.17  
   29.18 -#endif /* _SDL_androidvulkan_h */
   29.19 +#endif /* SDL_androidvulkan_h_ */
   29.20  
   29.21  /* vi: set ts=4 sw=4 expandtab: */
    30.1 --- a/src/video/android/SDL_androidwindow.h	Mon Aug 28 00:11:38 2017 -0700
    30.2 +++ b/src/video/android/SDL_androidwindow.h	Mon Aug 28 00:22:23 2017 -0700
    30.3 @@ -20,8 +20,8 @@
    30.4  */
    30.5  #include "../../SDL_internal.h"
    30.6  
    30.7 -#ifndef _SDL_androidwindow_h
    30.8 -#define _SDL_androidwindow_h
    30.9 +#ifndef SDL_androidwindow_h_
   30.10 +#define SDL_androidwindow_h_
   30.11  
   30.12  #include "../../core/android/SDL_android.h"
   30.13  #include "../SDL_egl_c.h"
   30.14 @@ -39,6 +39,6 @@
   30.15      
   30.16  } SDL_WindowData;
   30.17  
   30.18 -#endif /* _SDL_androidwindow_h */
   30.19 +#endif /* SDL_androidwindow_h_ */
   30.20  
   30.21  /* vi: set ts=4 sw=4 expandtab: */
    31.1 --- a/src/video/cocoa/SDL_cocoaclipboard.h	Mon Aug 28 00:11:38 2017 -0700
    31.2 +++ b/src/video/cocoa/SDL_cocoaclipboard.h	Mon Aug 28 00:22:23 2017 -0700
    31.3 @@ -20,8 +20,8 @@
    31.4  */
    31.5  #include "../../SDL_internal.h"
    31.6  
    31.7 -#ifndef _SDL_cocoaclipboard_h
    31.8 -#define _SDL_cocoaclipboard_h
    31.9 +#ifndef SDL_cocoaclipboard_h_
   31.10 +#define SDL_cocoaclipboard_h_
   31.11  
   31.12  /* Forward declaration */
   31.13  struct SDL_VideoData;
   31.14 @@ -31,6 +31,6 @@
   31.15  extern SDL_bool Cocoa_HasClipboardText(_THIS);
   31.16  extern void Cocoa_CheckClipboardUpdate(struct SDL_VideoData * data);
   31.17  
   31.18 -#endif /* _SDL_cocoaclipboard_h */
   31.19 +#endif /* SDL_cocoaclipboard_h_ */
   31.20  
   31.21  /* vi: set ts=4 sw=4 expandtab: */
    32.1 --- a/src/video/cocoa/SDL_cocoaevents.h	Mon Aug 28 00:11:38 2017 -0700
    32.2 +++ b/src/video/cocoa/SDL_cocoaevents.h	Mon Aug 28 00:22:23 2017 -0700
    32.3 @@ -20,13 +20,13 @@
    32.4  */
    32.5  #include "../../SDL_internal.h"
    32.6  
    32.7 -#ifndef _SDL_cocoaevents_h
    32.8 -#define _SDL_cocoaevents_h
    32.9 +#ifndef SDL_cocoaevents_h_
   32.10 +#define SDL_cocoaevents_h_
   32.11  
   32.12  extern void Cocoa_RegisterApp(void);
   32.13  extern void Cocoa_PumpEvents(_THIS);
   32.14  extern void Cocoa_SuspendScreenSaver(_THIS);
   32.15  
   32.16 -#endif /* _SDL_cocoaevents_h */
   32.17 +#endif /* SDL_cocoaevents_h_ */
   32.18  
   32.19  /* vi: set ts=4 sw=4 expandtab: */
    33.1 --- a/src/video/cocoa/SDL_cocoakeyboard.h	Mon Aug 28 00:11:38 2017 -0700
    33.2 +++ b/src/video/cocoa/SDL_cocoakeyboard.h	Mon Aug 28 00:22:23 2017 -0700
    33.3 @@ -20,8 +20,8 @@
    33.4  */
    33.5  #include "../../SDL_internal.h"
    33.6  
    33.7 -#ifndef _SDL_cocoakeyboard_h
    33.8 -#define _SDL_cocoakeyboard_h
    33.9 +#ifndef SDL_cocoakeyboard_h_
   33.10 +#define SDL_cocoakeyboard_h_
   33.11  
   33.12  extern void Cocoa_InitKeyboard(_THIS);
   33.13  extern void Cocoa_HandleKeyEvent(_THIS, NSEvent * event);
   33.14 @@ -31,6 +31,6 @@
   33.15  extern void Cocoa_StopTextInput(_THIS);
   33.16  extern void Cocoa_SetTextInputRect(_THIS, SDL_Rect *rect);
   33.17  
   33.18 -#endif /* _SDL_cocoakeyboard_h */
   33.19 +#endif /* SDL_cocoakeyboard_h_ */
   33.20  
   33.21  /* vi: set ts=4 sw=4 expandtab: */
    34.1 --- a/src/video/cocoa/SDL_cocoametalview.h	Mon Aug 28 00:11:38 2017 -0700
    34.2 +++ b/src/video/cocoa/SDL_cocoametalview.h	Mon Aug 28 00:22:23 2017 -0700
    34.3 @@ -26,8 +26,8 @@
    34.4   * how to add a CAMetalLayer backed view.
    34.5   */
    34.6  
    34.7 -#ifndef _SDL_cocoametalview_h
    34.8 -#define _SDL_cocoametalview_h
    34.9 +#ifndef SDL_cocoametalview_h_
   34.10 +#define SDL_cocoametalview_h_
   34.11  
   34.12  #import "../SDL_sysvideo.h"
   34.13  #import "SDL_cocoawindow.h"
   34.14 @@ -55,7 +55,7 @@
   34.15  
   34.16  void Cocoa_Mtl_GetDrawableSize(SDL_Window * window, int * w, int * h);
   34.17  
   34.18 -#endif /* _SDL_cocoametalview_h */
   34.19 +#endif /* SDL_cocoametalview_h_ */
   34.20  
   34.21  /* vi: set ts=4 sw=4 expandtab: */
   34.22  
    35.1 --- a/src/video/cocoa/SDL_cocoamodes.h	Mon Aug 28 00:11:38 2017 -0700
    35.2 +++ b/src/video/cocoa/SDL_cocoamodes.h	Mon Aug 28 00:22:23 2017 -0700
    35.3 @@ -20,8 +20,8 @@
    35.4  */
    35.5  #include "../../SDL_internal.h"
    35.6  
    35.7 -#ifndef _SDL_cocoamodes_h
    35.8 -#define _SDL_cocoamodes_h
    35.9 +#ifndef SDL_cocoamodes_h_
   35.10 +#define SDL_cocoamodes_h_
   35.11  
   35.12  typedef struct
   35.13  {
   35.14 @@ -41,6 +41,6 @@
   35.15  extern int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
   35.16  extern void Cocoa_QuitModes(_THIS);
   35.17  
   35.18 -#endif /* _SDL_cocoamodes_h */
   35.19 +#endif /* SDL_cocoamodes_h_ */
   35.20  
   35.21  /* vi: set ts=4 sw=4 expandtab: */
    36.1 --- a/src/video/cocoa/SDL_cocoamouse.h	Mon Aug 28 00:11:38 2017 -0700
    36.2 +++ b/src/video/cocoa/SDL_cocoamouse.h	Mon Aug 28 00:22:23 2017 -0700
    36.3 @@ -20,8 +20,8 @@
    36.4  */
    36.5  #include "../../SDL_internal.h"
    36.6  
    36.7 -#ifndef _SDL_cocoamouse_h
    36.8 -#define _SDL_cocoamouse_h
    36.9 +#ifndef SDL_cocoamouse_h_
   36.10 +#define SDL_cocoamouse_h_
   36.11  
   36.12  #include "SDL_cocoavideo.h"
   36.13  
   36.14 @@ -47,6 +47,6 @@
   36.15  + (NSCursor *)invisibleCursor;
   36.16  @end
   36.17  
   36.18 -#endif /* _SDL_cocoamouse_h */
   36.19 +#endif /* SDL_cocoamouse_h_ */
   36.20  
   36.21  /* vi: set ts=4 sw=4 expandtab: */
    37.1 --- a/src/video/cocoa/SDL_cocoamousetap.h	Mon Aug 28 00:11:38 2017 -0700
    37.2 +++ b/src/video/cocoa/SDL_cocoamousetap.h	Mon Aug 28 00:22:23 2017 -0700
    37.3 @@ -20,8 +20,8 @@
    37.4  */
    37.5  #include "../../SDL_internal.h"
    37.6  
    37.7 -#ifndef _SDL_cocoamousetap_h
    37.8 -#define _SDL_cocoamousetap_h
    37.9 +#ifndef SDL_cocoamousetap_h_
   37.10 +#define SDL_cocoamousetap_h_
   37.11  
   37.12  #include "SDL_cocoamouse.h"
   37.13  
   37.14 @@ -29,6 +29,6 @@
   37.15  extern void Cocoa_EnableMouseEventTap(SDL_MouseData *driverdata, SDL_bool enabled);
   37.16  extern void Cocoa_QuitMouseEventTap(SDL_MouseData *driverdata);
   37.17  
   37.18 -#endif /* _SDL_cocoamousetap_h */
   37.19 +#endif /* SDL_cocoamousetap_h_ */
   37.20  
   37.21  /* vi: set ts=4 sw=4 expandtab: */
    38.1 --- a/src/video/cocoa/SDL_cocoaopengl.h	Mon Aug 28 00:11:38 2017 -0700
    38.2 +++ b/src/video/cocoa/SDL_cocoaopengl.h	Mon Aug 28 00:22:23 2017 -0700
    38.3 @@ -20,8 +20,8 @@
    38.4  */
    38.5  #include "../../SDL_internal.h"
    38.6  
    38.7 -#ifndef _SDL_cocoaopengl_h
    38.8 -#define _SDL_cocoaopengl_h
    38.9 +#ifndef SDL_cocoaopengl_h_
   38.10 +#define SDL_cocoaopengl_h_
   38.11  
   38.12  #if SDL_VIDEO_OPENGL_CGL
   38.13  
   38.14 @@ -63,6 +63,6 @@
   38.15  
   38.16  #endif /* SDL_VIDEO_OPENGL_CGL */
   38.17  
   38.18 -#endif /* _SDL_cocoaopengl_h */
   38.19 +#endif /* SDL_cocoaopengl_h_ */
   38.20  
   38.21  /* vi: set ts=4 sw=4 expandtab: */
    39.1 --- a/src/video/cocoa/SDL_cocoashape.h	Mon Aug 28 00:11:38 2017 -0700
    39.2 +++ b/src/video/cocoa/SDL_cocoashape.h	Mon Aug 28 00:22:23 2017 -0700
    39.3 @@ -21,8 +21,8 @@
    39.4  
    39.5  #include "../../SDL_internal.h"
    39.6  
    39.7 -#ifndef _SDL_cocoashape_h
    39.8 -#define _SDL_cocoashape_h
    39.9 +#ifndef SDL_cocoashape_h_
   39.10 +#define SDL_cocoashape_h_
   39.11  
   39.12  #include "SDL_stdinc.h"
   39.13  #include "SDL_video.h"
   39.14 @@ -40,4 +40,6 @@
   39.15  extern int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
   39.16  extern int Cocoa_ResizeWindowShape(SDL_Window *window);
   39.17  
   39.18 -#endif
   39.19 +#endif /* SDL_cocoashape_h_ */
   39.20 +
   39.21 +/* vi: set ts=4 sw=4 expandtab: */
    40.1 --- a/src/video/cocoa/SDL_cocoavideo.h	Mon Aug 28 00:11:38 2017 -0700
    40.2 +++ b/src/video/cocoa/SDL_cocoavideo.h	Mon Aug 28 00:22:23 2017 -0700
    40.3 @@ -20,8 +20,8 @@
    40.4  */
    40.5  #include "../../SDL_internal.h"
    40.6  
    40.7 -#ifndef _SDL_cocoavideo_h
    40.8 -#define _SDL_cocoavideo_h
    40.9 +#ifndef SDL_cocoavideo_h_
   40.10 +#define SDL_cocoavideo_h_
   40.11  
   40.12  #include "SDL_opengl.h"
   40.13  
   40.14 @@ -113,6 +113,6 @@
   40.15  /* Utility functions */
   40.16  extern NSImage * Cocoa_CreateImage(SDL_Surface * surface);
   40.17  
   40.18 -#endif /* _SDL_cocoavideo_h */
   40.19 +#endif /* SDL_cocoavideo_h_ */
   40.20  
   40.21  /* vi: set ts=4 sw=4 expandtab: */
    41.1 --- a/src/video/cocoa/SDL_cocoavulkan.h	Mon Aug 28 00:11:38 2017 -0700
    41.2 +++ b/src/video/cocoa/SDL_cocoavulkan.h	Mon Aug 28 00:22:23 2017 -0700
    41.3 @@ -27,8 +27,8 @@
    41.4  
    41.5  #include "../../SDL_internal.h"
    41.6  
    41.7 -#ifndef _SDL_cocoavulkan_h
    41.8 -#define _SDL_cocoavulkan_h
    41.9 +#ifndef SDL_cocoavulkan_h_
   41.10 +#define SDL_cocoavulkan_h_
   41.11  
   41.12  #include "../SDL_vulkan_internal.h"
   41.13  #include "../SDL_sysvideo.h"
   41.14 @@ -50,6 +50,6 @@
   41.15  
   41.16  #endif
   41.17  
   41.18 -#endif /* _SDL_cocoavulkan_h */
   41.19 +#endif /* SDL_cocoavulkan_h_ */
   41.20  
   41.21  /* vi: set ts=4 sw=4 expandtab: */
    42.1 --- a/src/video/cocoa/SDL_cocoawindow.h	Mon Aug 28 00:11:38 2017 -0700
    42.2 +++ b/src/video/cocoa/SDL_cocoawindow.h	Mon Aug 28 00:22:23 2017 -0700
    42.3 @@ -20,8 +20,8 @@
    42.4  */
    42.5  #include "../../SDL_internal.h"
    42.6  
    42.7 -#ifndef _SDL_cocoawindow_h
    42.8 -#define _SDL_cocoawindow_h
    42.9 +#ifndef SDL_cocoawindow_h_
   42.10 +#define SDL_cocoawindow_h_
   42.11  
   42.12  #import <Cocoa/Cocoa.h>
   42.13  
   42.14 @@ -142,6 +142,6 @@
   42.15  extern SDL_bool Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info);
   42.16  extern int Cocoa_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
   42.17  
   42.18 -#endif /* _SDL_cocoawindow_h */
   42.19 +#endif /* SDL_cocoawindow_h_ */
   42.20  
   42.21  /* vi: set ts=4 sw=4 expandtab: */
    43.1 --- a/src/video/directfb/SDL_DirectFB_WM.h	Mon Aug 28 00:11:38 2017 -0700
    43.2 +++ b/src/video/directfb/SDL_DirectFB_WM.h	Mon Aug 28 00:22:23 2017 -0700
    43.3 @@ -19,8 +19,8 @@
    43.4    3. This notice may not be removed or altered from any source distribution.
    43.5  */
    43.6  
    43.7 -#ifndef _SDL_directfb_wm_h
    43.8 -#define _SDL_directfb_wm_h
    43.9 +#ifndef SDL_directfb_wm_h_
   43.10 +#define SDL_directfb_wm_h_
   43.11  
   43.12  #include "SDL_DirectFB_video.h"
   43.13  
   43.14 @@ -51,6 +51,6 @@
   43.15                                             int *cw, int *ch);
   43.16  
   43.17  
   43.18 -#endif /* _SDL_directfb_wm_h */
   43.19 +#endif /* SDL_directfb_wm_h_ */
   43.20  
   43.21  /* vi: set ts=4 sw=4 expandtab: */
    44.1 --- a/src/video/directfb/SDL_DirectFB_dyn.h	Mon Aug 28 00:11:38 2017 -0700
    44.2 +++ b/src/video/directfb/SDL_DirectFB_dyn.h	Mon Aug 28 00:22:23 2017 -0700
    44.3 @@ -19,8 +19,8 @@
    44.4    3. This notice may not be removed or altered from any source distribution.
    44.5  */
    44.6  
    44.7 -#ifndef _SDL_DirectFB_dyn_h
    44.8 -#define _SDL_DirectFB_dyn_h
    44.9 +#ifndef SDL_DirectFB_dyn_h_
   44.10 +#define SDL_DirectFB_dyn_h_
   44.11  
   44.12  #define DFB_SYMS \
   44.13      DFB_SYM(DFBResult, DirectFBError, (const char *msg, DFBResult result), (msg, result), return) \
   44.14 @@ -36,4 +36,6 @@
   44.15  int SDL_DirectFB_LoadLibrary(void);
   44.16  void SDL_DirectFB_UnLoadLibrary(void);
   44.17  
   44.18 -#endif
   44.19 +#endif /* SDL_DirectFB_dyn_h_ */
   44.20 +
   44.21 +/* vi: set ts=4 sw=4 expandtab: */
    45.1 --- a/src/video/directfb/SDL_DirectFB_events.h	Mon Aug 28 00:11:38 2017 -0700
    45.2 +++ b/src/video/directfb/SDL_DirectFB_events.h	Mon Aug 28 00:22:23 2017 -0700
    45.3 @@ -19,8 +19,8 @@
    45.4    3. This notice may not be removed or altered from any source distribution.
    45.5  */
    45.6  
    45.7 -#ifndef _SDL_DirectFB_events_h
    45.8 -#define _SDL_DirectFB_events_h
    45.9 +#ifndef SDL_DirectFB_events_h_
   45.10 +#define SDL_DirectFB_events_h_
   45.11  
   45.12  #include "../SDL_sysvideo.h"
   45.13  
   45.14 @@ -29,4 +29,6 @@
   45.15  extern void DirectFB_QuitKeyboard(_THIS);
   45.16  extern void DirectFB_PumpEventsWindow(_THIS);
   45.17  
   45.18 -#endif
   45.19 +#endif /* SDL_DirectFB_events_h_ */
   45.20 +
   45.21 +/* vi: set ts=4 sw=4 expandtab: */
    46.1 --- a/src/video/directfb/SDL_DirectFB_modes.h	Mon Aug 28 00:11:38 2017 -0700
    46.2 +++ b/src/video/directfb/SDL_DirectFB_modes.h	Mon Aug 28 00:22:23 2017 -0700
    46.3 @@ -19,8 +19,8 @@
    46.4    3. This notice may not be removed or altered from any source distribution.
    46.5  */
    46.6  
    46.7 -#ifndef _SDL_directfb_modes_h
    46.8 -#define _SDL_directfb_modes_h
    46.9 +#ifndef SDL_directfb_modes_h_
   46.10 +#define SDL_directfb_modes_h_
   46.11  
   46.12  #include <directfb.h>
   46.13  
   46.14 @@ -54,6 +54,6 @@
   46.15  
   46.16  extern void DirectFB_SetContext(_THIS, SDL_Window *window);
   46.17  
   46.18 -#endif /* _SDL_directfb_modes_h */
   46.19 +#endif /* SDL_directfb_modes_h_ */
   46.20  
   46.21  /* vi: set ts=4 sw=4 expandtab: */
    47.1 --- a/src/video/directfb/SDL_DirectFB_mouse.h	Mon Aug 28 00:11:38 2017 -0700
    47.2 +++ b/src/video/directfb/SDL_DirectFB_mouse.h	Mon Aug 28 00:22:23 2017 -0700
    47.3 @@ -19,8 +19,8 @@
    47.4    3. This notice may not be removed or altered from any source distribution.
    47.5  */
    47.6  
    47.7 -#ifndef _SDL_DirectFB_mouse_h
    47.8 -#define _SDL_DirectFB_mouse_h
    47.9 +#ifndef SDL_DirectFB_mouse_h_
   47.10 +#define SDL_DirectFB_mouse_h_
   47.11  
   47.12  #include <directfb.h>
   47.13  
   47.14 @@ -39,6 +39,6 @@
   47.15  extern void DirectFB_InitMouse(_THIS);
   47.16  extern void DirectFB_QuitMouse(_THIS);
   47.17  
   47.18 -#endif /* _SDL_DirectFB_mouse_h */
   47.19 +#endif /* SDL_DirectFB_mouse_h_ */
   47.20  
   47.21  /* vi: set ts=4 sw=4 expandtab: */
    48.1 --- a/src/video/directfb/SDL_DirectFB_opengl.h	Mon Aug 28 00:11:38 2017 -0700
    48.2 +++ b/src/video/directfb/SDL_DirectFB_opengl.h	Mon Aug 28 00:22:23 2017 -0700
    48.3 @@ -20,8 +20,8 @@
    48.4  */
    48.5  
    48.6  
    48.7 -#ifndef _SDL_directfb_opengl_h
    48.8 -#define _SDL_directfb_opengl_h
    48.9 +#ifndef SDL_directfb_opengl_h_
   48.10 +#define SDL_directfb_opengl_h_
   48.11  
   48.12  #include "SDL_DirectFB_video.h"
   48.13  
   48.14 @@ -59,6 +59,6 @@
   48.15  
   48.16  #endif /* SDL_DIRECTFB_OPENGL */
   48.17  
   48.18 -#endif /* _SDL_directfb_opengl_h */
   48.19 +#endif /* SDL_directfb_opengl_h_ */
   48.20  
   48.21  /* vi: set ts=4 sw=4 expandtab: */
    49.1 --- a/src/video/directfb/SDL_DirectFB_shape.h	Mon Aug 28 00:11:38 2017 -0700
    49.2 +++ b/src/video/directfb/SDL_DirectFB_shape.h	Mon Aug 28 00:22:23 2017 -0700
    49.3 @@ -19,8 +19,8 @@
    49.4    3. This notice may not be removed or altered from any source distribution.
    49.5  */
    49.6  
    49.7 -#ifndef _SDL_DirectFB_shape_h
    49.8 -#define _SDL_DirectFB_shape_h
    49.9 +#ifndef SDL_DirectFB_shape_h_
   49.10 +#define SDL_DirectFB_shape_h_
   49.11  
   49.12  #include <directfb.h>
   49.13  
   49.14 @@ -35,4 +35,4 @@
   49.15  extern int DirectFB_ResizeWindowShape(SDL_Window* window);
   49.16  extern int DirectFB_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode);
   49.17  
   49.18 -#endif /* _SDL_DirectFB_shape_h */
   49.19 +#endif /* SDL_DirectFB_shape_h_ */
    50.1 --- a/src/video/directfb/SDL_DirectFB_video.h	Mon Aug 28 00:11:38 2017 -0700
    50.2 +++ b/src/video/directfb/SDL_DirectFB_video.h	Mon Aug 28 00:22:23 2017 -0700
    50.3 @@ -21,8 +21,8 @@
    50.4  
    50.5  #include "../../SDL_internal.h"
    50.6  
    50.7 -#ifndef _SDL_DirectFB_video_h
    50.8 -#define _SDL_DirectFB_video_h
    50.9 +#ifndef SDL_DirectFB_video_h_
   50.10 +#define SDL_DirectFB_video_h_
   50.11  
   50.12  #include <directfb.h>
   50.13  #include <directfb_version.h>
   50.14 @@ -167,4 +167,4 @@
   50.15  void DirectFB_SetSupportedPixelFormats(SDL_RendererInfo *ri);
   50.16  
   50.17  
   50.18 -#endif /* _SDL_DirectFB_video_h */
   50.19 +#endif /* SDL_DirectFB_video_h_ */
    51.1 --- a/src/video/directfb/SDL_DirectFB_window.h	Mon Aug 28 00:11:38 2017 -0700
    51.2 +++ b/src/video/directfb/SDL_DirectFB_window.h	Mon Aug 28 00:22:23 2017 -0700
    51.3 @@ -19,8 +19,8 @@
    51.4    3. This notice may not be removed or altered from any source distribution.
    51.5  */
    51.6  
    51.7 -#ifndef _SDL_directfb_window_h
    51.8 -#define _SDL_directfb_window_h
    51.9 +#ifndef SDL_directfb_window_h_
   51.10 +#define SDL_directfb_window_h_
   51.11  
   51.12  #include "SDL_DirectFB_video.h"
   51.13  #include "SDL_DirectFB_WM.h"
   51.14 @@ -77,6 +77,6 @@
   51.15  extern void DirectFB_AdjustWindowSurface(SDL_Window * window);
   51.16  extern int DirectFB_SetWindowOpacity(_THIS, SDL_Window * window, float opacity);
   51.17  
   51.18 -#endif /* _SDL_directfb_window_h */
   51.19 +#endif /* SDL_directfb_window_h_ */
   51.20  
   51.21  /* vi: set ts=4 sw=4 expandtab: */
    52.1 --- a/src/video/emscripten/SDL_emscriptenevents.h	Mon Aug 28 00:11:38 2017 -0700
    52.2 +++ b/src/video/emscripten/SDL_emscriptenevents.h	Mon Aug 28 00:22:23 2017 -0700
    52.3 @@ -20,8 +20,8 @@
    52.4  */
    52.5  
    52.6  
    52.7 -#ifndef _SDL_emscriptenevents_h
    52.8 -#define _SDL_emscriptenevents_h
    52.9 +#ifndef SDL_emscriptenevents_h_
   52.10 +#define SDL_emscriptenevents_h_
   52.11  
   52.12  #include "SDL_emscriptenvideo.h"
   52.13  
   52.14 @@ -34,7 +34,7 @@
   52.15  extern EM_BOOL
   52.16  Emscripten_HandleCanvasResize(int eventType, const void *reserved, void *userData);
   52.17  
   52.18 -#endif /* _SDL_emscriptenevents_h */
   52.19 +#endif /* SDL_emscriptenevents_h_ */
   52.20  
   52.21  /* vi: set ts=4 sw=4 expandtab: */
   52.22  
    53.1 --- a/src/video/emscripten/SDL_emscriptenframebuffer.h	Mon Aug 28 00:11:38 2017 -0700
    53.2 +++ b/src/video/emscripten/SDL_emscriptenframebuffer.h	Mon Aug 28 00:22:23 2017 -0700
    53.3 @@ -20,13 +20,13 @@
    53.4  */
    53.5  #include "../../SDL_internal.h"
    53.6  
    53.7 -#ifndef _SDL_emscriptenframebuffer_h
    53.8 -#define _SDL_emscriptenframebuffer_h
    53.9 +#ifndef SDL_emscriptenframebuffer_h_
   53.10 +#define SDL_emscriptenframebuffer_h_
   53.11  
   53.12  extern int Emscripten_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
   53.13  extern int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
   53.14  extern void Emscripten_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
   53.15  
   53.16 -#endif /* _SDL_emscriptenframebuffer_h */
   53.17 +#endif /* SDL_emscriptenframebuffer_h_ */
   53.18  
   53.19  /* vi: set ts=4 sw=4 expandtab: */
    54.1 --- a/src/video/emscripten/SDL_emscriptenmouse.h	Mon Aug 28 00:11:38 2017 -0700
    54.2 +++ b/src/video/emscripten/SDL_emscriptenmouse.h	Mon Aug 28 00:22:23 2017 -0700
    54.3 @@ -20,8 +20,8 @@
    54.4  */
    54.5  
    54.6  
    54.7 -#ifndef _SDL_emscriptenmouse_h
    54.8 -#define _SDL_emscriptenmouse_h
    54.9 +#ifndef SDL_emscriptenmouse_h_
   54.10 +#define SDL_emscriptenmouse_h_
   54.11  
   54.12  #include "SDL_stdinc.h"
   54.13  
   54.14 @@ -37,6 +37,6 @@
   54.15  extern void
   54.16  Emscripten_FiniMouse();
   54.17  
   54.18 -#endif /* _SDL_emscriptenmouse_h */
   54.19 +#endif /* SDL_emscriptenmouse_h_ */
   54.20  
   54.21  /* vi: set ts=4 sw=4 expandtab: */
    55.1 --- a/src/video/emscripten/SDL_emscriptenopengles.h	Mon Aug 28 00:11:38 2017 -0700
    55.2 +++ b/src/video/emscripten/SDL_emscriptenopengles.h	Mon Aug 28 00:22:23 2017 -0700
    55.3 @@ -20,8 +20,8 @@
    55.4  */
    55.5  #include "../../SDL_internal.h"
    55.6  
    55.7 -#ifndef _SDL_emscriptenopengles_h
    55.8 -#define _SDL_emscriptenopengles_h
    55.9 +#ifndef SDL_emscriptenopengles_h_
   55.10 +#define SDL_emscriptenopengles_h_
   55.11  
   55.12  #if SDL_VIDEO_DRIVER_EMSCRIPTEN && SDL_VIDEO_OPENGL_EGL
   55.13  
   55.14 @@ -44,6 +44,6 @@
   55.15  
   55.16  #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN && SDL_VIDEO_OPENGL_EGL */
   55.17  
   55.18 -#endif /* _SDL_emscriptenopengles_h */
   55.19 +#endif /* SDL_emscriptenopengles_h_ */
   55.20  
   55.21  /* vi: set ts=4 sw=4 expandtab: */
    56.1 --- a/src/video/emscripten/SDL_emscriptenvideo.h	Mon Aug 28 00:11:38 2017 -0700
    56.2 +++ b/src/video/emscripten/SDL_emscriptenvideo.h	Mon Aug 28 00:22:23 2017 -0700
    56.3 @@ -20,8 +20,8 @@
    56.4  */
    56.5  #include "../../SDL_internal.h"
    56.6  
    56.7 -#ifndef _SDL_emscriptenvideo_h
    56.8 -#define _SDL_emscriptenvideo_h
    56.9 +#ifndef SDL_emscriptenvideo_h_
   56.10 +#define SDL_emscriptenvideo_h_
   56.11  
   56.12  #include "../SDL_sysvideo.h"
   56.13  #include "../../events/SDL_touch_c.h"
   56.14 @@ -53,6 +53,6 @@
   56.15      SDL_bool has_pointer_lock;
   56.16  } SDL_WindowData;
   56.17  
   56.18 -#endif /* _SDL_emscriptenvideo_h */
   56.19 +#endif /* SDL_emscriptenvideo_h_ */
   56.20  
   56.21  /* vi: set ts=4 sw=4 expandtab: */
    57.1 --- a/src/video/haiku/SDL_BWin.h	Mon Aug 28 00:11:38 2017 -0700
    57.2 +++ b/src/video/haiku/SDL_BWin.h	Mon Aug 28 00:22:23 2017 -0700
    57.3 @@ -19,8 +19,8 @@
    57.4    3. This notice may not be removed or altered from any source distribution.
    57.5  */
    57.6  
    57.7 -#ifndef _SDL_BWin_h
    57.8 -#define _SDL_BWin_h
    57.9 +#ifndef SDL_BWin_h_
   57.10 +#define SDL_BWin_h_
   57.11  
   57.12  #ifdef __cplusplus
   57.13  extern "C" {
   57.14 @@ -674,6 +674,6 @@
   57.15   *                         through a draw cycle.  Occurs when the previous
   57.16   *                         buffer provided by DirectConnected() is invalidated.
   57.17   */
   57.18 -#endif
   57.19 +#endif /* SDL_BWin_h_ */
   57.20  
   57.21  /* vi: set ts=4 sw=4 expandtab: */
    58.1 --- a/src/video/kmsdrm/SDL_kmsdrmdyn.h	Mon Aug 28 00:11:38 2017 -0700
    58.2 +++ b/src/video/kmsdrm/SDL_kmsdrmdyn.h	Mon Aug 28 00:22:23 2017 -0700
    58.3 @@ -19,8 +19,8 @@
    58.4    3. This notice may not be removed or altered from any source distribution.
    58.5  */
    58.6  
    58.7 -#ifndef _SDL_kmsdrmdyn_h
    58.8 -#define _SDL_kmsdrmdyn_h
    58.9 +#ifndef SDL_kmsdrmdyn_h_
   58.10 +#define SDL_kmsdrmdyn_h_
   58.11  
   58.12  #include "../../SDL_internal.h"
   58.13  
   58.14 @@ -48,6 +48,6 @@
   58.15  }
   58.16  #endif
   58.17  
   58.18 -#endif /* !defined _SDL_kmsdrmdyn_h */
   58.19 +#endif /* SDL_kmsdrmdyn_h_ */
   58.20  
   58.21  /* vi: set ts=4 sw=4 expandtab: */
    59.1 --- a/src/video/kmsdrm/SDL_kmsdrmevents.h	Mon Aug 28 00:11:38 2017 -0700
    59.2 +++ b/src/video/kmsdrm/SDL_kmsdrmevents.h	Mon Aug 28 00:22:23 2017 -0700
    59.3 @@ -21,11 +21,11 @@
    59.4  
    59.5  #include "../../SDL_internal.h"
    59.6  
    59.7 -#ifndef _SDL_kmsdrmevents_h
    59.8 -#define _SDL_kmsdrmevents_h
    59.9 +#ifndef SDL_kmsdrmevents_h_
   59.10 +#define SDL_kmsdrmevents_h_
   59.11  
   59.12  extern void KMSDRM_PumpEvents(_THIS);
   59.13  extern void KMSDRM_EventInit(_THIS);
   59.14  extern void KMSDRM_EventQuit(_THIS);
   59.15  
   59.16 -#endif /* _SDL_kmsdrmevents_h */
   59.17 +#endif /* SDL_kmsdrmevents_h_ */
    60.1 --- a/src/video/kmsdrm/SDL_kmsdrmmouse.h	Mon Aug 28 00:11:38 2017 -0700
    60.2 +++ b/src/video/kmsdrm/SDL_kmsdrmmouse.h	Mon Aug 28 00:22:23 2017 -0700
    60.3 @@ -21,8 +21,8 @@
    60.4  
    60.5  #include "../../SDL_internal.h"
    60.6  
    60.7 -#ifndef _SDL_KMSDRM_mouse_h
    60.8 -#define _SDL_KMSDRM_mouse_h
    60.9 +#ifndef SDL_KMSDRM_mouse_h_
   60.10 +#define SDL_KMSDRM_mouse_h_
   60.11  
   60.12  #include <gbm.h>
   60.13  
   60.14 @@ -37,6 +37,6 @@
   60.15  extern void KMSDRM_InitMouse(_THIS);
   60.16  extern void KMSDRM_QuitMouse(_THIS);
   60.17  
   60.18 -#endif /* _SDL_KMSDRM_mouse_h */
   60.19 +#endif /* SDL_KMSDRM_mouse_h_ */
   60.20  
   60.21  /* vi: set ts=4 sw=4 expandtab: */
    61.1 --- a/src/video/kmsdrm/SDL_kmsdrmopengles.h	Mon Aug 28 00:11:38 2017 -0700
    61.2 +++ b/src/video/kmsdrm/SDL_kmsdrmopengles.h	Mon Aug 28 00:22:23 2017 -0700
    61.3 @@ -20,8 +20,8 @@
    61.4  */
    61.5  #include "../../SDL_internal.h"
    61.6  
    61.7 -#ifndef _SDL_kmsdrmopengles_h
    61.8 -#define _SDL_kmsdrmopengles_h
    61.9 +#ifndef SDL_kmsdrmopengles_h_
   61.10 +#define SDL_kmsdrmopengles_h_
   61.11  
   61.12  #if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL
   61.13  
   61.14 @@ -43,6 +43,6 @@
   61.15  
   61.16  #endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */
   61.17  
   61.18 -#endif /* _SDL_kmsdrmopengles_h */
   61.19 +#endif /* SDL_kmsdrmopengles_h_ */
   61.20  
   61.21  /* vi: set ts=4 sw=4 expandtab: */
    62.1 --- a/src/video/mir/SDL_mirdyn.h	Mon Aug 28 00:11:38 2017 -0700
    62.2 +++ b/src/video/mir/SDL_mirdyn.h	Mon Aug 28 00:22:23 2017 -0700
    62.3 @@ -19,8 +19,8 @@
    62.4    3. This notice may not be removed or altered from any source distribution.
    62.5  */
    62.6  
    62.7 -#ifndef _SDL_mirdyn_h
    62.8 -#define _SDL_mirdyn_h
    62.9 +#ifndef SDL_mirdyn_h_
   62.10 +#define SDL_mirdyn_h_
   62.11  
   62.12  #include "../../SDL_internal.h"
   62.13  
   62.14 @@ -48,6 +48,6 @@
   62.15  }
   62.16  #endif
   62.17  
   62.18 -#endif /* !defined _SDL_mirdyn_h */
   62.19 +#endif /* !defined SDL_mirdyn_h_ */
   62.20  
   62.21  /* vi: set ts=4 sw=4 expandtab: */
    63.1 --- a/src/video/mir/SDL_mirevents.h	Mon Aug 28 00:11:38 2017 -0700
    63.2 +++ b/src/video/mir/SDL_mirevents.h	Mon Aug 28 00:22:23 2017 -0700
    63.3 @@ -23,15 +23,15 @@
    63.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    63.5  */
    63.6  
    63.7 -#ifndef _SDL_mirevents_h
    63.8 -#define _SDL_mirevents_h
    63.9 +#ifndef SDL_mirevents_h_
   63.10 +#define SDL_mirevents_h_
   63.11  
   63.12  #include <mir_toolkit/mir_client_library.h>
   63.13  
   63.14  extern void
   63.15  MIR_HandleEvent(MirWindow*, MirEvent const* ev, void* context);
   63.16  
   63.17 -#endif /* _SDL_mirevents_h */
   63.18 +#endif /* SDL_mirevents_h_ */
   63.19  
   63.20  /* vi: set ts=4 sw=4 expandtab: */
   63.21  
    64.1 --- a/src/video/mir/SDL_mirframebuffer.h	Mon Aug 28 00:11:38 2017 -0700
    64.2 +++ b/src/video/mir/SDL_mirframebuffer.h	Mon Aug 28 00:22:23 2017 -0700
    64.3 @@ -23,8 +23,8 @@
    64.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    64.5  */
    64.6  
    64.7 -#ifndef _SDL_mirframebuffer_h
    64.8 -#define _SDL_mirframebuffer_h
    64.9 +#ifndef SDL_mirframebuffer_h_
   64.10 +#define SDL_mirframebuffer_h_
   64.11  
   64.12  #include "../SDL_sysvideo.h"
   64.13  
   64.14 @@ -41,7 +41,7 @@
   64.15  extern void
   64.16  MIR_DestroyWindowFramebuffer(_THIS, SDL_Window* sdl_window);
   64.17  
   64.18 -#endif /* _SDL_mirframebuffer_h */
   64.19 +#endif /* SDL_mirframebuffer_h_ */
   64.20  
   64.21  /* vi: set ts=4 sw=4 expandtab: */
   64.22  
    65.1 --- a/src/video/mir/SDL_mirmouse.h	Mon Aug 28 00:11:38 2017 -0700
    65.2 +++ b/src/video/mir/SDL_mirmouse.h	Mon Aug 28 00:22:23 2017 -0700
    65.3 @@ -23,8 +23,8 @@
    65.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    65.5  */
    65.6  
    65.7 -#ifndef _SDL_mirmouse_h
    65.8 -#define _SDL_mirmouse_h
    65.9 +#ifndef SDL_mirmouse_h_
   65.10 +#define SDL_mirmouse_h_
   65.11  
   65.12  extern void
   65.13  MIR_InitMouse();
   65.14 @@ -32,6 +32,6 @@
   65.15  extern void
   65.16  MIR_FiniMouse();
   65.17  
   65.18 -#endif /* _SDL_mirmouse_h */
   65.19 +#endif /* SDL_mirmouse_h_ */
   65.20  
   65.21  /* vi: set ts=4 sw=4 expandtab: */
    66.1 --- a/src/video/mir/SDL_miropengl.h	Mon Aug 28 00:11:38 2017 -0700
    66.2 +++ b/src/video/mir/SDL_miropengl.h	Mon Aug 28 00:22:23 2017 -0700
    66.3 @@ -23,8 +23,8 @@
    66.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    66.5  */
    66.6  
    66.7 -#ifndef _SDL_miropengl_h
    66.8 -#define _SDL_miropengl_h
    66.9 +#ifndef SDL_miropengl_h_
   66.10 +#define SDL_miropengl_h_
   66.11  
   66.12  #include "SDL_mirwindow.h"
   66.13  
   66.14 @@ -48,6 +48,6 @@
   66.15  extern int
   66.16  MIR_GL_LoadLibrary(_THIS, const char* path);
   66.17  
   66.18 -#endif /* _SDL_miropengl_h */
   66.19 +#endif /* SDL_miropengl_h_ */
   66.20  
   66.21  /* vi: set ts=4 sw=4 expandtab: */
    67.1 --- a/src/video/mir/SDL_mirvideo.h	Mon Aug 28 00:11:38 2017 -0700
    67.2 +++ b/src/video/mir/SDL_mirvideo.h	Mon Aug 28 00:22:23 2017 -0700
    67.3 @@ -23,8 +23,8 @@
    67.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    67.5  */
    67.6  
    67.7 -#ifndef _SDL_mirvideo_h_
    67.8 -#define _SDL_mirvideo_h_
    67.9 +#ifndef SDL_mirvideo_h__
   67.10 +#define SDL_mirvideo_h__
   67.11  
   67.12  #include <EGL/egl.h>
   67.13  #include <mir_toolkit/mir_client_library.h>
   67.14 @@ -44,6 +44,6 @@
   67.15  extern Uint32
   67.16  MIR_GetSDLPixelFormat(MirPixelFormat format);
   67.17  
   67.18 -#endif /* _SDL_mirvideo_h_ */
   67.19 +#endif /* SDL_mirvideo_h__ */
   67.20  
   67.21  /* vi: set ts=4 sw=4 expandtab: */
    68.1 --- a/src/video/mir/SDL_mirvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    68.2 +++ b/src/video/mir/SDL_mirvulkan.h	Mon Aug 28 00:22:23 2017 -0700
    68.3 @@ -26,8 +26,8 @@
    68.4  
    68.5  #include "../../SDL_internal.h"
    68.6  
    68.7 -#ifndef _SDL_mirvulkan_h
    68.8 -#define _SDL_mirvulkan_h
    68.9 +#ifndef SDL_mirvulkan_h_
   68.10 +#define SDL_mirvulkan_h_
   68.11  
   68.12  #include "../SDL_vulkan_internal.h"
   68.13  #include "../SDL_sysvideo.h"
   68.14 @@ -47,6 +47,6 @@
   68.15  
   68.16  #endif
   68.17  
   68.18 -#endif /* _SDL_mirvulkan_h */
   68.19 +#endif /* SDL_mirvulkan_h_ */
   68.20  
   68.21  /* vi: set ts=4 sw=4 expandtab: */
    69.1 --- a/src/video/mir/SDL_mirwindow.h	Mon Aug 28 00:11:38 2017 -0700
    69.2 +++ b/src/video/mir/SDL_mirwindow.h	Mon Aug 28 00:22:23 2017 -0700
    69.3 @@ -23,8 +23,8 @@
    69.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    69.5  */
    69.6  
    69.7 -#ifndef _SDL_mirwindow_h
    69.8 -#define _SDL_mirwindow_h
    69.9 +#ifndef SDL_mirwindow_h_
   69.10 +#define SDL_mirwindow_h_
   69.11  
   69.12  #include "../SDL_sysvideo.h"
   69.13  #include "SDL_syswm.h"
   69.14 @@ -87,7 +87,7 @@
   69.15  extern int
   69.16  MIR_GetWindowGammaRamp(_THIS, SDL_Window* window, Uint16* ramp);
   69.17  
   69.18 -#endif /* _SDL_mirwindow_h */
   69.19 +#endif /* SDL_mirwindow_h_ */
   69.20  
   69.21  /* vi: set ts=4 sw=4 expandtab: */
   69.22  
    70.1 --- a/src/video/nacl/SDL_naclevents_c.h	Mon Aug 28 00:11:38 2017 -0700
    70.2 +++ b/src/video/nacl/SDL_naclevents_c.h	Mon Aug 28 00:22:23 2017 -0700
    70.3 @@ -20,11 +20,11 @@
    70.4  */
    70.5  #include "../../SDL_internal.h"
    70.6  
    70.7 -#ifndef _SDL_naclevents_c_h
    70.8 -#define _SDL_naclevents_c_h
    70.9 +#ifndef SDL_naclevents_c_h_
   70.10 +#define SDL_naclevents_c_h_
   70.11  
   70.12  #include "SDL_naclvideo.h"
   70.13  
   70.14  extern void NACL_PumpEvents(_THIS);
   70.15  
   70.16 -#endif /* _SDL_naclevents_c_h */
   70.17 +#endif /* SDL_naclevents_c_h_ */
    71.1 --- a/src/video/nacl/SDL_naclopengles.h	Mon Aug 28 00:11:38 2017 -0700
    71.2 +++ b/src/video/nacl/SDL_naclopengles.h	Mon Aug 28 00:22:23 2017 -0700
    71.3 @@ -20,8 +20,8 @@
    71.4  */
    71.5  #include "../../SDL_internal.h"
    71.6  
    71.7 -#ifndef _SDL_naclopengles_h
    71.8 -#define _SDL_naclopengles_h
    71.9 +#ifndef SDL_naclopengles_h_
   71.10 +#define SDL_naclopengles_h_
   71.11  
   71.12  extern int NACL_GLES_LoadLibrary(_THIS, const char *path);
   71.13  extern void *NACL_GLES_GetProcAddress(_THIS, const char *proc);
   71.14 @@ -33,6 +33,6 @@
   71.15  extern int NACL_GLES_SwapWindow(_THIS, SDL_Window * window);
   71.16  extern void NACL_GLES_DeleteContext(_THIS, SDL_GLContext context);
   71.17  
   71.18 -#endif /* _SDL_naclopengles_h */
   71.19 +#endif /* SDL_naclopengles_h_ */
   71.20  
   71.21  /* vi: set ts=4 sw=4 expandtab: */
    72.1 --- a/src/video/nacl/SDL_naclvideo.h	Mon Aug 28 00:11:38 2017 -0700
    72.2 +++ b/src/video/nacl/SDL_naclvideo.h	Mon Aug 28 00:22:23 2017 -0700
    72.3 @@ -20,8 +20,8 @@
    72.4  */
    72.5  #include "../../SDL_internal.h"
    72.6  
    72.7 -#ifndef _SDL_naclvideo_h
    72.8 -#define _SDL_naclvideo_h
    72.9 +#ifndef SDL_naclvideo_h_
   72.10 +#define SDL_naclvideo_h_
   72.11  
   72.12  #include "../SDL_sysvideo.h"
   72.13  #include "ppapi_simple/ps_interface.h"
   72.14 @@ -64,4 +64,4 @@
   72.15  extern void NACL_SetScreenResolution(int width, int height, Uint32 format);
   72.16  
   72.17  
   72.18 -#endif /* _SDL_naclvideo_h */
   72.19 +#endif /* SDL_naclvideo_h_ */
    73.1 --- a/src/video/nacl/SDL_naclwindow.h	Mon Aug 28 00:11:38 2017 -0700
    73.2 +++ b/src/video/nacl/SDL_naclwindow.h	Mon Aug 28 00:22:23 2017 -0700
    73.3 @@ -20,13 +20,13 @@
    73.4  */
    73.5  #include "../../SDL_internal.h"
    73.6  
    73.7 -#ifndef _SDL_naclwindow_h
    73.8 -#define _SDL_naclwindow_h
    73.9 +#ifndef SDL_naclwindow_h_
   73.10 +#define SDL_naclwindow_h_
   73.11  
   73.12  extern int NACL_CreateWindow(_THIS, SDL_Window * window);
   73.13  extern void NACL_SetWindowTitle(_THIS, SDL_Window * window);
   73.14  extern void NACL_DestroyWindow(_THIS, SDL_Window * window);
   73.15  
   73.16 -#endif /* _SDL_naclwindow_h */
   73.17 +#endif /* SDL_naclwindow_h_ */
   73.18  
   73.19  /* vi: set ts=4 sw=4 expandtab: */
    74.1 --- a/src/video/psp/SDL_pspgl_c.h	Mon Aug 28 00:11:38 2017 -0700
    74.2 +++ b/src/video/psp/SDL_pspgl_c.h	Mon Aug 28 00:22:23 2017 -0700
    74.3 @@ -19,8 +19,8 @@
    74.4    3. This notice may not be removed or altered from any source distribution.
    74.5  */
    74.6  
    74.7 -#ifndef _SDL_pspgl_c_h
    74.8 -#define _SDL_pspgl_c_h
    74.9 +#ifndef SDL_pspgl_c_h_
   74.10 +#define SDL_pspgl_c_h_
   74.11  
   74.12  
   74.13  #include <GLES/egl.h>
   74.14 @@ -49,4 +49,6 @@
   74.15  extern int PSP_GL_GetSwapInterval(_THIS);
   74.16  
   74.17  
   74.18 -#endif /* _SDL_pspgl_c_h */
   74.19 +#endif /* SDL_pspgl_c_h_ */
   74.20 +
   74.21 +/* vi: set ts=4 sw=4 expandtab: */
    75.1 --- a/src/video/psp/SDL_pspvideo.h	Mon Aug 28 00:11:38 2017 -0700
    75.2 +++ b/src/video/psp/SDL_pspvideo.h	Mon Aug 28 00:22:23 2017 -0700
    75.3 @@ -19,8 +19,8 @@
    75.4    3. This notice may not be removed or altered from any source distribution.
    75.5  */
    75.6  
    75.7 -#ifndef _SDL_pspvideo_h
    75.8 -#define _SDL_pspvideo_h
    75.9 +#ifndef SDL_pspvideo_h_
   75.10 +#define SDL_pspvideo_h_
   75.11  
   75.12  #include <GLES/egl.h>
   75.13  
   75.14 @@ -97,6 +97,6 @@
   75.15  void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);
   75.16  SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window);
   75.17  
   75.18 -#endif /* _SDL_pspvideo_h */
   75.19 +#endif /* SDL_pspvideo_h_ */
   75.20  
   75.21  /* vi: set ts=4 sw=4 expandtab: */
    76.1 --- a/src/video/raspberry/SDL_rpievents_c.h	Mon Aug 28 00:11:38 2017 -0700
    76.2 +++ b/src/video/raspberry/SDL_rpievents_c.h	Mon Aug 28 00:22:23 2017 -0700
    76.3 @@ -19,8 +19,8 @@
    76.4    3. This notice may not be removed or altered from any source distribution.
    76.5  */
    76.6  
    76.7 -#ifndef _SDL_rpievents_c_h
    76.8 -#define _SDL_rpievents_c_h
    76.9 +#ifndef SDL_rpievents_c_h_
   76.10 +#define SDL_rpievents_c_h_
   76.11  
   76.12  #include "SDL_rpivideo.h"
   76.13  
   76.14 @@ -28,4 +28,4 @@
   76.15  void RPI_EventInit(_THIS);
   76.16  void RPI_EventQuit(_THIS);
   76.17  
   76.18 -#endif /* _SDL_rpievents_c_h */
   76.19 +#endif /* SDL_rpievents_c_h_ */
    77.1 --- a/src/video/raspberry/SDL_rpimouse.h	Mon Aug 28 00:11:38 2017 -0700
    77.2 +++ b/src/video/raspberry/SDL_rpimouse.h	Mon Aug 28 00:22:23 2017 -0700
    77.3 @@ -19,8 +19,8 @@
    77.4    3. This notice may not be removed or altered from any source distribution.
    77.5  */
    77.6  
    77.7 -#ifndef _SDL_RPI_mouse_h
    77.8 -#define _SDL_RPI_mouse_h
    77.9 +#ifndef SDL_RPI_mouse_h_
   77.10 +#define SDL_RPI_mouse_h_
   77.11  
   77.12  #include "../SDL_sysvideo.h"
   77.13  
   77.14 @@ -38,6 +38,6 @@
   77.15  extern void RPI_InitMouse(_THIS);
   77.16  extern void RPI_QuitMouse(_THIS);
   77.17  
   77.18 -#endif /* _SDL_RPI_mouse_h */
   77.19 +#endif /* SDL_RPI_mouse_h_ */
   77.20  
   77.21  /* vi: set ts=4 sw=4 expandtab: */
    78.1 --- a/src/video/raspberry/SDL_rpiopengles.h	Mon Aug 28 00:11:38 2017 -0700
    78.2 +++ b/src/video/raspberry/SDL_rpiopengles.h	Mon Aug 28 00:22:23 2017 -0700
    78.3 @@ -20,8 +20,8 @@
    78.4  */
    78.5  #include "../../SDL_internal.h"
    78.6  
    78.7 -#ifndef _SDL_rpiopengles_h
    78.8 -#define _SDL_rpiopengles_h
    78.9 +#ifndef SDL_rpiopengles_h_
   78.10 +#define SDL_rpiopengles_h_
   78.11  
   78.12  #if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
   78.13  
   78.14 @@ -43,6 +43,6 @@
   78.15  
   78.16  #endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */
   78.17  
   78.18 -#endif /* _SDL_rpiopengles_h */
   78.19 +#endif /* SDL_rpiopengles_h_ */
   78.20  
   78.21  /* vi: set ts=4 sw=4 expandtab: */
    79.1 --- a/src/video/uikit/SDL_uikitclipboard.h	Mon Aug 28 00:11:38 2017 -0700
    79.2 +++ b/src/video/uikit/SDL_uikitclipboard.h	Mon Aug 28 00:22:23 2017 -0700
    79.3 @@ -18,8 +18,8 @@
    79.4       misrepresented as being the original software.
    79.5    3. This notice may not be removed or altered from any source distribution.
    79.6  */
    79.7 -#ifndef _SDL_uikitclipboard_h
    79.8 -#define _SDL_uikitclipboard_h
    79.9 +#ifndef SDL_uikitclipboard_h_
   79.10 +#define SDL_uikitclipboard_h_
   79.11  
   79.12  #include "../SDL_sysvideo.h"
   79.13  
   79.14 @@ -30,6 +30,6 @@
   79.15  extern void UIKit_InitClipboard(_THIS);
   79.16  extern void UIKit_QuitClipboard(_THIS);
   79.17  
   79.18 -#endif /* _SDL_uikitclipboard_h */
   79.19 +#endif /* SDL_uikitclipboard_h_ */
   79.20  
   79.21  /* vi: set ts=4 sw=4 expandtab: */
    80.1 --- a/src/video/uikit/SDL_uikitevents.h	Mon Aug 28 00:11:38 2017 -0700
    80.2 +++ b/src/video/uikit/SDL_uikitevents.h	Mon Aug 28 00:22:23 2017 -0700
    80.3 @@ -18,13 +18,13 @@
    80.4       misrepresented as being the original software.
    80.5    3. This notice may not be removed or altered from any source distribution.
    80.6  */
    80.7 -#ifndef _SDL_uikitevents_h
    80.8 -#define _SDL_uikitevents_h
    80.9 +#ifndef SDL_uikitevents_h_
   80.10 +#define SDL_uikitevents_h_
   80.11  
   80.12  #include "../SDL_sysvideo.h"
   80.13  
   80.14  extern void UIKit_PumpEvents(_THIS);
   80.15  
   80.16 -#endif /* _SDL_uikitevents_h */
   80.17 +#endif /* SDL_uikitevents_h_ */
   80.18  
   80.19  /* vi: set ts=4 sw=4 expandtab: */
    81.1 --- a/src/video/uikit/SDL_uikitmetalview.h	Mon Aug 28 00:11:38 2017 -0700
    81.2 +++ b/src/video/uikit/SDL_uikitmetalview.h	Mon Aug 28 00:22:23 2017 -0700
    81.3 @@ -26,8 +26,8 @@
    81.4   * how to add a CAMetalLayer backed view.
    81.5   */
    81.6  
    81.7 -#ifndef _SDL_uikitmetalview_h
    81.8 -#define _SDL_uikitmetalview_h
    81.9 +#ifndef SDL_uikitmetalview_h_
   81.10 +#define SDL_uikitmetalview_h_
   81.11  
   81.12  #import "../SDL_sysvideo.h"
   81.13  #import "SDL_uikitwindow.h"
   81.14 @@ -50,4 +50,6 @@
   81.15  
   81.16  void UIKit_Mtl_GetDrawableSize(SDL_Window * window, int * w, int * h);
   81.17  
   81.18 -#endif /* _SDL_uikitmetalview_h */
   81.19 +#endif /* SDL_uikitmetalview_h_ */
   81.20 +
   81.21 +/* vi: set ts=4 sw=4 expandtab: */
    82.1 --- a/src/video/uikit/SDL_uikitmodes.h	Mon Aug 28 00:11:38 2017 -0700
    82.2 +++ b/src/video/uikit/SDL_uikitmodes.h	Mon Aug 28 00:22:23 2017 -0700
    82.3 @@ -20,8 +20,8 @@
    82.4  */
    82.5  #include "../../SDL_internal.h"
    82.6  
    82.7 -#ifndef _SDL_uikitmodes_h
    82.8 -#define _SDL_uikitmodes_h
    82.9 +#ifndef SDL_uikitmodes_h_
   82.10 +#define SDL_uikitmodes_h_
   82.11  
   82.12  #include "SDL_uikitvideo.h"
   82.13  
   82.14 @@ -45,6 +45,6 @@
   82.15  extern void UIKit_QuitModes(_THIS);
   82.16  extern int UIKit_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect);
   82.17  
   82.18 -#endif /* _SDL_uikitmodes_h */
   82.19 +#endif /* SDL_uikitmodes_h_ */
   82.20  
   82.21  /* vi: set ts=4 sw=4 expandtab: */
    83.1 --- a/src/video/uikit/SDL_uikitopengles.h	Mon Aug 28 00:11:38 2017 -0700
    83.2 +++ b/src/video/uikit/SDL_uikitopengles.h	Mon Aug 28 00:22:23 2017 -0700
    83.3 @@ -18,8 +18,8 @@
    83.4       misrepresented as being the original software.
    83.5    3. This notice may not be removed or altered from any source distribution.
    83.6  */
    83.7 -#ifndef _SDL_uikitopengles
    83.8 -#define _SDL_uikitopengles
    83.9 +#ifndef SDL_uikitopengles_
   83.10 +#define SDL_uikitopengles_
   83.11  
   83.12  #include "../SDL_sysvideo.h"
   83.13  
   83.14 @@ -35,6 +35,6 @@
   83.15  
   83.16  extern void UIKit_GL_RestoreCurrentContext(void);
   83.17  
   83.18 -#endif
   83.19 +#endif /* SDL_uikitopengles_ */
   83.20  
   83.21  /* vi: set ts=4 sw=4 expandtab: */
    84.1 --- a/src/video/uikit/SDL_uikitvideo.h	Mon Aug 28 00:11:38 2017 -0700
    84.2 +++ b/src/video/uikit/SDL_uikitvideo.h	Mon Aug 28 00:22:23 2017 -0700
    84.3 @@ -18,8 +18,8 @@
    84.4       misrepresented as being the original software.
    84.5    3. This notice may not be removed or altered from any source distribution.
    84.6  */
    84.7 -#ifndef _SDL_uikitvideo_h
    84.8 -#define _SDL_uikitvideo_h
    84.9 +#ifndef SDL_uikitvideo_h_
   84.10 +#define SDL_uikitvideo_h_
   84.11  
   84.12  #include "../SDL_sysvideo.h"
   84.13  
   84.14 @@ -41,6 +41,6 @@
   84.15  
   84.16  SDL_bool UIKit_IsSystemVersionAtLeast(double version);
   84.17  
   84.18 -#endif /* _SDL_uikitvideo_h */
   84.19 +#endif /* SDL_uikitvideo_h_ */
   84.20  
   84.21  /* vi: set ts=4 sw=4 expandtab: */
    85.1 --- a/src/video/uikit/SDL_uikitvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    85.2 +++ b/src/video/uikit/SDL_uikitvulkan.h	Mon Aug 28 00:22:23 2017 -0700
    85.3 @@ -26,8 +26,8 @@
    85.4  
    85.5  #include "../../SDL_internal.h"
    85.6  
    85.7 -#ifndef _SDL_uikitvulkan_h
    85.8 -#define _SDL_uikitvulkan_h
    85.9 +#ifndef SDL_uikitvulkan_h_
   85.10 +#define SDL_uikitvulkan_h_
   85.11  
   85.12  #include "../SDL_vulkan_internal.h"
   85.13  #include "../SDL_sysvideo.h"
   85.14 @@ -49,6 +49,6 @@
   85.15  
   85.16  #endif
   85.17  
   85.18 -#endif /* _SDL_uikitvulkan_h */
   85.19 +#endif /* SDL_uikitvulkan_h_ */
   85.20  
   85.21  /* vi: set ts=4 sw=4 expandtab: */
    86.1 --- a/src/video/uikit/SDL_uikitwindow.h	Mon Aug 28 00:11:38 2017 -0700
    86.2 +++ b/src/video/uikit/SDL_uikitwindow.h	Mon Aug 28 00:22:23 2017 -0700
    86.3 @@ -18,8 +18,8 @@
    86.4       misrepresented as being the original software.
    86.5    3. This notice may not be removed or altered from any source distribution.
    86.6  */
    86.7 -#ifndef _SDL_uikitwindow_h
    86.8 -#define _SDL_uikitwindow_h
    86.9 +#ifndef SDL_uikitwindow_h_
   86.10 +#define SDL_uikitwindow_h_
   86.11  
   86.12  #include "../SDL_sysvideo.h"
   86.13  #import "SDL_uikitvideo.h"
   86.14 @@ -51,6 +51,6 @@
   86.15  
   86.16  @end
   86.17  
   86.18 -#endif /* _SDL_uikitwindow_h */
   86.19 +#endif /* SDL_uikitwindow_h_ */
   86.20  
   86.21  /* vi: set ts=4 sw=4 expandtab: */
    87.1 --- a/src/video/vivante/SDL_vivanteopengles.h	Mon Aug 28 00:11:38 2017 -0700
    87.2 +++ b/src/video/vivante/SDL_vivanteopengles.h	Mon Aug 28 00:22:23 2017 -0700
    87.3 @@ -20,8 +20,8 @@
    87.4  */
    87.5  #include "../../SDL_internal.h"
    87.6  
    87.7 -#ifndef _SDL_vivanteopengles_h
    87.8 -#define _SDL_vivanteopengles_h
    87.9 +#ifndef SDL_vivanteopengles_h_
   87.10 +#define SDL_vivanteopengles_h_
   87.11  
   87.12  #if SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL
   87.13  
   87.14 @@ -43,6 +43,6 @@
   87.15  
   87.16  #endif /* SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL */
   87.17  
   87.18 -#endif /* _SDL_vivanteopengles_h */
   87.19 +#endif /* SDL_vivanteopengles_h_ */
   87.20  
   87.21  /* vi: set ts=4 sw=4 expandtab: */
    88.1 --- a/src/video/vivante/SDL_vivanteplatform.h	Mon Aug 28 00:11:38 2017 -0700
    88.2 +++ b/src/video/vivante/SDL_vivanteplatform.h	Mon Aug 28 00:22:23 2017 -0700
    88.3 @@ -20,8 +20,8 @@
    88.4  */
    88.5  #include "../../SDL_internal.h"
    88.6  
    88.7 -#ifndef _SDL_vivanteplatform_h
    88.8 -#define _SDL_vivanteplatform_h
    88.9 +#ifndef SDL_vivanteplatform_h_
   88.10 +#define SDL_vivanteplatform_h_
   88.11  
   88.12  #if SDL_VIDEO_DRIVER_VIVANTE
   88.13  
   88.14 @@ -40,6 +40,6 @@
   88.15  
   88.16  #endif /* SDL_VIDEO_DRIVER_VIVANTE */
   88.17  
   88.18 -#endif /* _SDL_vivanteplatform_h */
   88.19 +#endif /* SDL_vivanteplatform_h_ */
   88.20  
   88.21  /* vi: set ts=4 sw=4 expandtab: */
    89.1 --- a/src/video/vivante/SDL_vivantevideo.h	Mon Aug 28 00:11:38 2017 -0700
    89.2 +++ b/src/video/vivante/SDL_vivantevideo.h	Mon Aug 28 00:22:23 2017 -0700
    89.3 @@ -19,8 +19,8 @@
    89.4    3. This notice may not be removed or altered from any source distribution.
    89.5  */
    89.6  
    89.7 -#ifndef _SDL_vivantevideo_h
    89.8 -#define _SDL_vivantevideo_h
    89.9 +#ifndef SDL_vivantevideo_h_
   89.10 +#define SDL_vivantevideo_h_
   89.11  
   89.12  #include "../../SDL_internal.h"
   89.13  #include "../SDL_sysvideo.h"
   89.14 @@ -86,6 +86,6 @@
   89.15  /* Event functions */
   89.16  void VIVANTE_PumpEvents(_THIS);
   89.17  
   89.18 -#endif /* _SDL_vivantevideo_h */
   89.19 +#endif /* SDL_vivantevideo_h_ */
   89.20  
   89.21  /* vi: set ts=4 sw=4 expandtab: */
    90.1 --- a/src/video/wayland/SDL_waylandclipboard.h	Mon Aug 28 00:11:38 2017 -0700
    90.2 +++ b/src/video/wayland/SDL_waylandclipboard.h	Mon Aug 28 00:22:23 2017 -0700
    90.3 @@ -20,13 +20,13 @@
    90.4  */
    90.5  #include "../../SDL_internal.h"
    90.6  
    90.7 -#ifndef _SDL_waylandclipboard_h
    90.8 -#define _SDL_waylandclipboard_h
    90.9 +#ifndef SDL_waylandclipboard_h_
   90.10 +#define SDL_waylandclipboard_h_
   90.11  
   90.12  extern int Wayland_SetClipboardText(_THIS, const char *text);
   90.13  extern char *Wayland_GetClipboardText(_THIS);
   90.14  extern SDL_bool Wayland_HasClipboardText(_THIS);
   90.15  
   90.16 -#endif /* _SDL_waylandclipboard_h */
   90.17 +#endif /* SDL_waylandclipboard_h_ */
   90.18  
   90.19  /* vi: set ts=4 sw=4 expandtab: */
    91.1 --- a/src/video/wayland/SDL_waylanddatamanager.h	Mon Aug 28 00:11:38 2017 -0700
    91.2 +++ b/src/video/wayland/SDL_waylanddatamanager.h	Mon Aug 28 00:22:23 2017 -0700
    91.3 @@ -21,8 +21,8 @@
    91.4  
    91.5  #include "../../SDL_internal.h"
    91.6  
    91.7 -#ifndef _SDL_waylanddatamanager_h
    91.8 -#define _SDL_waylanddatamanager_h
    91.9 +#ifndef SDL_waylanddatamanager_h_
   91.10 +#define SDL_waylanddatamanager_h_
   91.11  
   91.12  #include "SDL_waylandvideo.h"
   91.13  #include "SDL_waylandwindow.h"
   91.14 @@ -97,9 +97,7 @@
   91.15                                               SDL_WaylandDataSource *source);
   91.16  extern int Wayland_data_device_set_serial(SDL_WaylandDataDevice *device,
   91.17                                            uint32_t serial);
   91.18 -#endif /* _SDL_waylanddatamanager_h */
   91.19 +#endif /* SDL_waylanddatamanager_h_ */
   91.20  
   91.21  /* vi: set ts=4 sw=4 expandtab: */
   91.22  
   91.23 -
   91.24 -
    92.1 --- a/src/video/wayland/SDL_waylanddyn.h	Mon Aug 28 00:11:38 2017 -0700
    92.2 +++ b/src/video/wayland/SDL_waylanddyn.h	Mon Aug 28 00:22:23 2017 -0700
    92.3 @@ -19,8 +19,8 @@
    92.4    3. This notice may not be removed or altered from any source distribution.
    92.5  */
    92.6  
    92.7 -#ifndef _SDL_waylanddyn_h
    92.8 -#define _SDL_waylanddyn_h
    92.9 +#ifndef SDL_waylanddyn_h_
   92.10 +#define SDL_waylanddyn_h_
   92.11  
   92.12  #include "../../SDL_internal.h"
   92.13  
   92.14 @@ -102,6 +102,6 @@
   92.15  #include "wayland-client-protocol.h"
   92.16  #include "wayland-egl.h"
   92.17  
   92.18 -#endif /* !defined _SDL_waylanddyn_h */
   92.19 +#endif /* SDL_waylanddyn_h_ */
   92.20  
   92.21  /* vi: set ts=4 sw=4 expandtab: */
    93.1 --- a/src/video/wayland/SDL_waylandevents_c.h	Mon Aug 28 00:11:38 2017 -0700
    93.2 +++ b/src/video/wayland/SDL_waylandevents_c.h	Mon Aug 28 00:22:23 2017 -0700
    93.3 @@ -21,8 +21,8 @@
    93.4  
    93.5  #include "../../SDL_internal.h"
    93.6  
    93.7 -#ifndef _SDL_waylandevents_h
    93.8 -#define _SDL_waylandevents_h
    93.9 +#ifndef SDL_waylandevents_h_
   93.10 +#define SDL_waylandevents_h_
   93.11  
   93.12  #include "SDL_waylandvideo.h"
   93.13  #include "SDL_waylandwindow.h"
   93.14 @@ -46,6 +46,6 @@
   93.15  extern void Wayland_display_add_relative_pointer_manager(SDL_VideoData *d, uint32_t id);
   93.16  extern void Wayland_display_destroy_relative_pointer_manager(SDL_VideoData *d);
   93.17  
   93.18 -#endif /* _SDL_waylandevents_h */
   93.19 +#endif /* SDL_waylandevents_h_ */
   93.20  
   93.21  /* vi: set ts=4 sw=4 expandtab: */
    94.1 --- a/src/video/wayland/SDL_waylandopengles.h	Mon Aug 28 00:11:38 2017 -0700
    94.2 +++ b/src/video/wayland/SDL_waylandopengles.h	Mon Aug 28 00:22:23 2017 -0700
    94.3 @@ -20,8 +20,8 @@
    94.4  */
    94.5  #include "../../SDL_internal.h"
    94.6  
    94.7 -#ifndef _SDL_waylandopengles_h
    94.8 -#define _SDL_waylandopengles_h
    94.9 +#ifndef SDL_waylandopengles_h_
   94.10 +#define SDL_waylandopengles_h_
   94.11  
   94.12  #include "../SDL_sysvideo.h"
   94.13  #include "../SDL_egl_c.h"
   94.14 @@ -43,4 +43,6 @@
   94.15  extern int Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
   94.16  extern void Wayland_GLES_DeleteContext(_THIS, SDL_GLContext context);
   94.17  
   94.18 -#endif /* _SDL_waylandopengles_h */
   94.19 +#endif /* SDL_waylandopengles_h_ */
   94.20 +
   94.21 +/* vi: set ts=4 sw=4 expandtab: */
    95.1 --- a/src/video/wayland/SDL_waylandtouch.h	Mon Aug 28 00:11:38 2017 -0700
    95.2 +++ b/src/video/wayland/SDL_waylandtouch.h	Mon Aug 28 00:22:23 2017 -0700
    95.3 @@ -23,8 +23,8 @@
    95.4  
    95.5  #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
    95.6  
    95.7 -#ifndef _SDL_waylandtouch_h
    95.8 -#define _SDL_waylandtouch_h
    95.9 +#ifndef SDL_waylandtouch_h_
   95.10 +#define SDL_waylandtouch_h_
   95.11  
   95.12  #include "SDL_waylandvideo.h"
   95.13  #include <stdint.h>
   95.14 @@ -347,6 +347,6 @@
   95.15               QT_WINDOWMANAGER_OPEN_URL, remaining, url);
   95.16  }
   95.17  
   95.18 -#endif /* _SDL_waylandtouch_h */
   95.19 +#endif /* SDL_waylandtouch_h_ */
   95.20  
   95.21  #endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
    96.1 --- a/src/video/wayland/SDL_waylandvideo.h	Mon Aug 28 00:11:38 2017 -0700
    96.2 +++ b/src/video/wayland/SDL_waylandvideo.h	Mon Aug 28 00:22:23 2017 -0700
    96.3 @@ -21,8 +21,8 @@
    96.4  
    96.5  #include "../../SDL_internal.h"
    96.6  
    96.7 -#ifndef _SDL_waylandvideo_h
    96.8 -#define _SDL_waylandvideo_h
    96.9 +#ifndef SDL_waylandvideo_h_
   96.10 +#define SDL_waylandvideo_h_
   96.11  
   96.12  #include <EGL/egl.h>
   96.13  #include "wayland-util.h"
   96.14 @@ -66,6 +66,6 @@
   96.15      int relative_mouse_mode;
   96.16  } SDL_VideoData;
   96.17  
   96.18 -#endif /* _SDL_waylandvideo_h */
   96.19 +#endif /* SDL_waylandvideo_h_ */
   96.20  
   96.21  /* vi: set ts=4 sw=4 expandtab: */
    97.1 --- a/src/video/wayland/SDL_waylandvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    97.2 +++ b/src/video/wayland/SDL_waylandvulkan.h	Mon Aug 28 00:22:23 2017 -0700
    97.3 @@ -26,8 +26,8 @@
    97.4  
    97.5  #include "../../SDL_internal.h"
    97.6  
    97.7 -#ifndef _SDL_waylandvulkan_h
    97.8 -#define _SDL_waylandvulkan_h
    97.9 +#ifndef SDL_waylandvulkan_h_
   97.10 +#define SDL_waylandvulkan_h_
   97.11  
   97.12  #include "../SDL_vulkan_internal.h"
   97.13  #include "../SDL_sysvideo.h"
   97.14 @@ -47,6 +47,6 @@
   97.15  
   97.16  #endif
   97.17  
   97.18 -#endif /* _SDL_waylandvulkan_h */
   97.19 +#endif /* SDL_waylandvulkan_h_ */
   97.20  
   97.21  /* vi: set ts=4 sw=4 expandtab: */
    98.1 --- a/src/video/wayland/SDL_waylandwindow.h	Mon Aug 28 00:11:38 2017 -0700
    98.2 +++ b/src/video/wayland/SDL_waylandwindow.h	Mon Aug 28 00:22:23 2017 -0700
    98.3 @@ -21,8 +21,8 @@
    98.4  
    98.5  #include "../../SDL_internal.h"
    98.6  
    98.7 -#ifndef _SDL_waylandwindow_h
    98.8 -#define _SDL_waylandwindow_h
    98.9 +#ifndef SDL_waylandwindow_h_
   98.10 +#define SDL_waylandwindow_h_
   98.11  
   98.12  #include "../SDL_sysvideo.h"
   98.13  #include "SDL_syswm.h"
   98.14 @@ -61,6 +61,6 @@
   98.15  Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info);
   98.16  extern int Wayland_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
   98.17  
   98.18 -#endif /* _SDL_waylandwindow_h */
   98.19 +#endif /* SDL_waylandwindow_h_ */
   98.20  
   98.21  /* vi: set ts=4 sw=4 expandtab: */
    99.1 --- a/src/video/windows/SDL_msctf.h	Mon Aug 28 00:11:38 2017 -0700
    99.2 +++ b/src/video/windows/SDL_msctf.h	Mon Aug 28 00:22:23 2017 -0700
    99.3 @@ -19,8 +19,8 @@
    99.4    3. This notice may not be removed or altered from any source distribution.
    99.5  */
    99.6  
    99.7 -#ifndef _SDL_msctf_h
    99.8 -#define _SDL_msctf_h
    99.9 +#ifndef SDL_msctf_h_
   99.10 +#define SDL_msctf_h_
   99.11  
   99.12  #include <unknwn.h>
   99.13  
   99.14 @@ -239,4 +239,4 @@
   99.15      const struct ITfSourceVtbl *lpVtbl;
   99.16  };
   99.17  
   99.18 -#endif /* _SDL_msctf_h */
   99.19 +#endif /* SDL_msctf_h_ */
   100.1 --- a/src/video/windows/SDL_windowsclipboard.h	Mon Aug 28 00:11:38 2017 -0700
   100.2 +++ b/src/video/windows/SDL_windowsclipboard.h	Mon Aug 28 00:22:23 2017 -0700
   100.3 @@ -20,8 +20,8 @@
   100.4  */
   100.5  #include "../../SDL_internal.h"
   100.6  
   100.7 -#ifndef _SDL_windowsclipboard_h
   100.8 -#define _SDL_windowsclipboard_h
   100.9 +#ifndef SDL_windowsclipboard_h_
  100.10 +#define SDL_windowsclipboard_h_
  100.11  
  100.12  /* Forward declaration */
  100.13  struct SDL_VideoData;
  100.14 @@ -31,6 +31,6 @@
  100.15  extern SDL_bool WIN_HasClipboardText(_THIS);
  100.16  extern void WIN_CheckClipboardUpdate(struct SDL_VideoData * data);
  100.17  
  100.18 -#endif /* _SDL_windowsclipboard_h */
  100.19 +#endif /* SDL_windowsclipboard_h_ */
  100.20  
  100.21  /* vi: set ts=4 sw=4 expandtab: */
   101.1 --- a/src/video/windows/SDL_windowsevents.h	Mon Aug 28 00:11:38 2017 -0700
   101.2 +++ b/src/video/windows/SDL_windowsevents.h	Mon Aug 28 00:22:23 2017 -0700
   101.3 @@ -20,8 +20,8 @@
   101.4  */
   101.5  #include "../../SDL_internal.h"
   101.6  
   101.7 -#ifndef _SDL_windowsevents_h
   101.8 -#define _SDL_windowsevents_h
   101.9 +#ifndef SDL_windowsevents_h_
  101.10 +#define SDL_windowsevents_h_
  101.11  
  101.12  extern LPTSTR SDL_Appname;
  101.13  extern Uint32 SDL_Appstyle;
  101.14 @@ -31,6 +31,6 @@
  101.15                                         LPARAM lParam);
  101.16  extern void WIN_PumpEvents(_THIS);
  101.17  
  101.18 -#endif /* _SDL_windowsevents_h */
  101.19 +#endif /* SDL_windowsevents_h_ */
  101.20  
  101.21  /* vi: set ts=4 sw=4 expandtab: */
   102.1 --- a/src/video/windows/SDL_windowskeyboard.h	Mon Aug 28 00:11:38 2017 -0700
   102.2 +++ b/src/video/windows/SDL_windowskeyboard.h	Mon Aug 28 00:22:23 2017 -0700
   102.3 @@ -20,8 +20,8 @@
   102.4  */
   102.5  #include "../../SDL_internal.h"
   102.6  
   102.7 -#ifndef _SDL_windowskeyboard_h
   102.8 -#define _SDL_windowskeyboard_h
   102.9 +#ifndef SDL_windowskeyboard_h_
  102.10 +#define SDL_windowskeyboard_h_
  102.11  
  102.12  extern void WIN_InitKeyboard(_THIS);
  102.13  extern void WIN_UpdateKeymap(void);
  102.14 @@ -35,6 +35,6 @@
  102.15  
  102.16  extern SDL_bool IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, struct SDL_VideoData *videodata);
  102.17  
  102.18 -#endif /* _SDL_windowskeyboard_h */
  102.19 +#endif /* SDL_windowskeyboard_h_ */
  102.20  
  102.21  /* vi: set ts=4 sw=4 expandtab: */
   103.1 --- a/src/video/windows/SDL_windowsmodes.h	Mon Aug 28 00:11:38 2017 -0700
   103.2 +++ b/src/video/windows/SDL_windowsmodes.h	Mon Aug 28 00:22:23 2017 -0700
   103.3 @@ -20,8 +20,8 @@
   103.4  */
   103.5  #include "../../SDL_internal.h"
   103.6  
   103.7 -#ifndef _SDL_windowsmodes_h
   103.8 -#define _SDL_windowsmodes_h
   103.9 +#ifndef SDL_windowsmodes_h_
  103.10 +#define SDL_windowsmodes_h_
  103.11  
  103.12  typedef struct
  103.13  {
  103.14 @@ -42,6 +42,6 @@
  103.15  extern int WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
  103.16  extern void WIN_QuitModes(_THIS);
  103.17  
  103.18 -#endif /* _SDL_windowsmodes_h */
  103.19 +#endif /* SDL_windowsmodes_h_ */
  103.20  
  103.21  /* vi: set ts=4 sw=4 expandtab: */
   104.1 --- a/src/video/windows/SDL_windowsmouse.h	Mon Aug 28 00:11:38 2017 -0700
   104.2 +++ b/src/video/windows/SDL_windowsmouse.h	Mon Aug 28 00:22:23 2017 -0700
   104.3 @@ -20,14 +20,14 @@
   104.4  */
   104.5  #include "../../SDL_internal.h"
   104.6  
   104.7 -#ifndef _SDL_windowsmouse_h
   104.8 -#define _SDL_windowsmouse_h
   104.9 +#ifndef SDL_windowsmouse_h_
  104.10 +#define SDL_windowsmouse_h_
  104.11  
  104.12  extern HCURSOR SDL_cursor;
  104.13  
  104.14  extern void WIN_InitMouse(_THIS);
  104.15  extern void WIN_QuitMouse(_THIS);
  104.16  
  104.17 -#endif /* _SDL_windowsmouse_h */
  104.18 +#endif /* SDL_windowsmouse_h_ */
  104.19  
  104.20  /* vi: set ts=4 sw=4 expandtab: */
   105.1 --- a/src/video/windows/SDL_windowsopengl.h	Mon Aug 28 00:11:38 2017 -0700
   105.2 +++ b/src/video/windows/SDL_windowsopengl.h	Mon Aug 28 00:22:23 2017 -0700
   105.3 @@ -20,8 +20,8 @@
   105.4  */
   105.5  #include "../../SDL_internal.h"
   105.6  
   105.7 -#ifndef _SDL_windowsopengl_h
   105.8 -#define _SDL_windowsopengl_h
   105.9 +#ifndef SDL_windowsopengl_h_
  105.10 +#define SDL_windowsopengl_h_
  105.11  
  105.12  #if SDL_VIDEO_OPENGL_WGL
  105.13  
  105.14 @@ -137,6 +137,6 @@
  105.15  
  105.16  #endif /* SDL_VIDEO_OPENGL_WGL */
  105.17  
  105.18 -#endif /* _SDL_windowsopengl_h */
  105.19 +#endif /* SDL_windowsopengl_h_ */
  105.20  
  105.21  /* vi: set ts=4 sw=4 expandtab: */
   106.1 --- a/src/video/windows/SDL_windowsopengles.h	Mon Aug 28 00:11:38 2017 -0700
   106.2 +++ b/src/video/windows/SDL_windowsopengles.h	Mon Aug 28 00:22:23 2017 -0700
   106.3 @@ -20,8 +20,8 @@
   106.4  */
   106.5  #include "../../SDL_internal.h"
   106.6  
   106.7 -#ifndef _SDL_winopengles_h
   106.8 -#define _SDL_winopengles_h
   106.9 +#ifndef SDL_winopengles_h_
  106.10 +#define SDL_winopengles_h_
  106.11  
  106.12  #if SDL_VIDEO_OPENGL_EGL
  106.13  
  106.14 @@ -44,6 +44,6 @@
  106.15  
  106.16  #endif /* SDL_VIDEO_OPENGL_EGL */
  106.17  
  106.18 -#endif /* _SDL_winopengles_h */
  106.19 +#endif /* SDL_winopengles_h_ */
  106.20  
  106.21  /* vi: set ts=4 sw=4 expandtab: */
   107.1 --- a/src/video/windows/SDL_windowsshape.h	Mon Aug 28 00:11:38 2017 -0700
   107.2 +++ b/src/video/windows/SDL_windowsshape.h	Mon Aug 28 00:22:23 2017 -0700
   107.3 @@ -21,8 +21,8 @@
   107.4  
   107.5  #include "../../SDL_internal.h"
   107.6  
   107.7 -#ifndef _SDL_windowsshape_h
   107.8 -#define _SDL_windowsshape_h
   107.9 +#ifndef SDL_windowsshape_h_
  107.10 +#define SDL_windowsshape_h_
  107.11  
  107.12  #include "SDL_video.h"
  107.13  #include "SDL_shape.h"
  107.14 @@ -37,4 +37,4 @@
  107.15  extern int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
  107.16  extern int Win32_ResizeWindowShape(SDL_Window *window);
  107.17  
  107.18 -#endif /* _SDL_windowsshape_h */
  107.19 +#endif /* SDL_windowsshape_h_ */
   108.1 --- a/src/video/windows/SDL_windowsvideo.h	Mon Aug 28 00:11:38 2017 -0700
   108.2 +++ b/src/video/windows/SDL_windowsvideo.h	Mon Aug 28 00:22:23 2017 -0700
   108.3 @@ -20,8 +20,8 @@
   108.4  */
   108.5  #include "../../SDL_internal.h"
   108.6  
   108.7 -#ifndef _SDL_windowsvideo_h
   108.8 -#define _SDL_windowsvideo_h
   108.9 +#ifndef SDL_windowsvideo_h_
  108.10 +#define SDL_windowsvideo_h_
  108.11  
  108.12  #include "../../core/windows/SDL_windows.h"
  108.13  
  108.14 @@ -194,6 +194,6 @@
  108.15  typedef struct IDirect3D9 IDirect3D9;
  108.16  extern SDL_bool D3D_LoadDLL( void **pD3DDLL, IDirect3D9 **pDirect3D9Interface );
  108.17  
  108.18 -#endif /* _SDL_windowsvideo_h */
  108.19 +#endif /* SDL_windowsvideo_h_ */
  108.20  
  108.21  /* vi: set ts=4 sw=4 expandtab: */
   109.1 --- a/src/video/windows/SDL_windowsvulkan.h	Mon Aug 28 00:11:38 2017 -0700
   109.2 +++ b/src/video/windows/SDL_windowsvulkan.h	Mon Aug 28 00:22:23 2017 -0700
   109.3 @@ -26,8 +26,8 @@
   109.4  
   109.5  #include "../../SDL_internal.h"
   109.6  
   109.7 -#ifndef _SDL_windowsvulkan_h
   109.8 -#define _SDL_windowsvulkan_h
   109.9 +#ifndef SDL_windowsvulkan_h_
  109.10 +#define SDL_windowsvulkan_h_
  109.11  
  109.12  #include "../SDL_vulkan_internal.h"
  109.13  #include "../SDL_sysvideo.h"
  109.14 @@ -47,6 +47,6 @@
  109.15  
  109.16  #endif
  109.17  
  109.18 -#endif /* _SDL_windowsvulkan_h */
  109.19 +#endif /* SDL_windowsvulkan_h_ */
  109.20  
  109.21  /* vi: set ts=4 sw=4 expandtab: */
   110.1 --- a/src/video/windows/SDL_windowswindow.h	Mon Aug 28 00:11:38 2017 -0700
   110.2 +++ b/src/video/windows/SDL_windowswindow.h	Mon Aug 28 00:22:23 2017 -0700
   110.3 @@ -20,8 +20,8 @@
   110.4  */
   110.5  #include "../../SDL_internal.h"
   110.6  
   110.7 -#ifndef _SDL_windowswindow_h
   110.8 -#define _SDL_windowswindow_h
   110.9 +#ifndef SDL_windowswindow_h_
  110.10 +#define SDL_windowswindow_h_
  110.11  
  110.12  #if SDL_VIDEO_OPENGL_EGL   
  110.13  #include "../SDL_egl_c.h"
  110.14 @@ -78,6 +78,6 @@
  110.15  extern void WIN_UpdateClipCursor(SDL_Window *window);
  110.16  extern int WIN_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
  110.17  
  110.18 -#endif /* _SDL_windowswindow_h */
  110.19 +#endif /* SDL_windowswindow_h_ */
  110.20  
  110.21  /* vi: set ts=4 sw=4 expandtab: */
   111.1 --- a/src/video/winrt/SDL_winrtgamebar_cpp.h	Mon Aug 28 00:11:38 2017 -0700
   111.2 +++ b/src/video/winrt/SDL_winrtgamebar_cpp.h	Mon Aug 28 00:22:23 2017 -0700
   111.3 @@ -20,8 +20,8 @@
   111.4  */
   111.5  #include "SDL_config.h"
   111.6  
   111.7 -#ifndef _SDL_winrtgamebar_h
   111.8 -#define _SDL_winrtgamebar_h
   111.9 +#ifndef SDL_winrtgamebar_h_
  111.10 +#define SDL_winrtgamebar_h_
  111.11  
  111.12  #ifdef __cplusplus
  111.13  /* These are exported as C++ functions, rather than C, to fix a compilation
  111.14 @@ -30,6 +30,6 @@
  111.15  extern void WINRT_QuitGameBar(_THIS);
  111.16  #endif
  111.17  
  111.18 -#endif /* _SDL_winrtgamebar_h */
  111.19 +#endif /* SDL_winrtgamebar_h_ */
  111.20  
  111.21  /* vi: set ts=4 sw=4 expandtab: */
   112.1 --- a/src/video/winrt/SDL_winrtmouse_c.h	Mon Aug 28 00:11:38 2017 -0700
   112.2 +++ b/src/video/winrt/SDL_winrtmouse_c.h	Mon Aug 28 00:22:23 2017 -0700
   112.3 @@ -20,8 +20,8 @@
   112.4  */
   112.5  #include "SDL_config.h"
   112.6  
   112.7 -#ifndef _SDL_winrtmouse_h
   112.8 -#define _SDL_winrtmouse_h
   112.9 +#ifndef SDL_winrtmouse_h_
  112.10 +#define SDL_winrtmouse_h_
  112.11  
  112.12  #ifdef __cplusplus
  112.13  extern "C" {
  112.14 @@ -35,6 +35,6 @@
  112.15  }
  112.16  #endif
  112.17  
  112.18 -#endif /* _SDL_winrtmouse_h */
  112.19 +#endif /* SDL_winrtmouse_h_ */
  112.20  
  112.21  /* vi: set ts=4 sw=4 expandtab: */
   113.1 --- a/src/video/winrt/SDL_winrtopengles.h	Mon Aug 28 00:11:38 2017 -0700
   113.2 +++ b/src/video/winrt/SDL_winrtopengles.h	Mon Aug 28 00:22:23 2017 -0700
   113.3 @@ -20,8 +20,8 @@
   113.4  */
   113.5  #include "SDL_config.h"
   113.6  
   113.7 -#ifndef _SDL_winrtopengles_h
   113.8 -#define _SDL_winrtopengles_h
   113.9 +#ifndef SDL_winrtopengles_h_
  113.10 +#define SDL_winrtopengles_h_
  113.11  
  113.12  #if SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL
  113.13  
  113.14 @@ -65,6 +65,6 @@
  113.15  
  113.16  #endif /* SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL */
  113.17  
  113.18 -#endif /* _SDL_winrtopengles_h */
  113.19 +#endif /* SDL_winrtopengles_h_ */
  113.20  
  113.21  /* vi: set ts=4 sw=4 expandtab: */
   114.1 --- a/src/video/x11/SDL_x11vulkan.h	Mon Aug 28 00:11:38 2017 -0700
   114.2 +++ b/src/video/x11/SDL_x11vulkan.h	Mon Aug 28 00:22:23 2017 -0700
   114.3 @@ -20,8 +20,8 @@
   114.4  */
   114.5  #include "../../SDL_internal.h"
   114.6  
   114.7 -#ifndef _SDL_x11vulkan_h
   114.8 -#define _SDL_x11vulkan_h
   114.9 +#ifndef SDL_x11vulkan_h_
  114.10 +#define SDL_x11vulkan_h_
  114.11  
  114.12  #include "../SDL_vulkan_internal.h"
  114.13  
  114.14 @@ -43,6 +43,6 @@
  114.15  
  114.16  #endif
  114.17  
  114.18 -#endif /* _SDL_x11vulkan_h */
  114.19 +#endif /* SDL_x11vulkan_h_ */
  114.20  
  114.21  /* vi: set ts=4 sw=4 expandtab: */
   115.1 --- a/visualtest/include/SDL_visualtest_action_configparser.h	Mon Aug 28 00:11:38 2017 -0700
   115.2 +++ b/visualtest/include/SDL_visualtest_action_configparser.h	Mon Aug 28 00:22:23 2017 -0700
   115.3 @@ -5,8 +5,8 @@
   115.4   * Header file for the parser for action config files.
   115.5   */
   115.6  
   115.7 -#ifndef _SDL_visualtest_action_configparser_h
   115.8 -#define _SDL_visualtest_action_configparser_h
   115.9 +#ifndef SDL_visualtest_action_configparser_h_
  115.10 +#define SDL_visualtest_action_configparser_h_
  115.11  
  115.12  /** The maximum length of one line in the actions file */
  115.13  #define MAX_ACTION_LINE_LENGTH 300
  115.14 @@ -144,4 +144,6 @@
  115.15  }
  115.16  #endif
  115.17  
  115.18 -#endif /* _SDL_visualtest_action_configparser_h */
  115.19 \ No newline at end of file
  115.20 +#endif /* SDL_visualtest_action_configparser_h_ */
  115.21 +
  115.22 +/* vi: set ts=4 sw=4 expandtab: */
   116.1 --- a/visualtest/include/SDL_visualtest_exhaustive_variator.h	Mon Aug 28 00:11:38 2017 -0700
   116.2 +++ b/visualtest/include/SDL_visualtest_exhaustive_variator.h	Mon Aug 28 00:22:23 2017 -0700
   116.3 @@ -8,8 +8,8 @@
   116.4  #include "SDL_visualtest_harness_argparser.h"
   116.5  #include "SDL_visualtest_variator_common.h"
   116.6  
   116.7 -#ifndef _SDL_visualtest_exhaustive_variator_h
   116.8 -#define _SDL_visualtest_exhaustive_variator_h
   116.9 +#ifndef SDL_visualtest_exhaustive_variator_h_
  116.10 +#define SDL_visualtest_exhaustive_variator_h_
  116.11  
  116.12  /* Set up for C function definitions, even when using C++ */
  116.13  #ifdef __cplusplus
  116.14 @@ -59,4 +59,6 @@
  116.15  }
  116.16  #endif
  116.17  
  116.18 -#endif /* _SDL_visualtest_exhaustive_variator_h */
  116.19 \ No newline at end of file
  116.20 +#endif /* SDL_visualtest_exhaustive_variator_h_ */
  116.21 +
  116.22 +/* vi: set ts=4 sw=4 expandtab: */
   117.1 --- a/visualtest/include/SDL_visualtest_harness_argparser.h	Mon Aug 28 00:11:38 2017 -0700
   117.2 +++ b/visualtest/include/SDL_visualtest_harness_argparser.h	Mon Aug 28 00:22:23 2017 -0700
   117.3 @@ -9,8 +9,8 @@
   117.4  #include "SDL_visualtest_variator_common.h"
   117.5  #include "SDL_visualtest_action_configparser.h"
   117.6  
   117.7 -#ifndef _SDL_visualtest_harness_argparser_h
   117.8 -#define _SDL_visualtest_harness_argparser_h
   117.9 +#ifndef SDL_visualtest_harness_argparser_h_
  117.10 +#define SDL_visualtest_harness_argparser_h_
  117.11  
  117.12  /** Maximum length of a path string */
  117.13  #define MAX_PATH_LEN 300
  117.14 @@ -70,4 +70,6 @@
  117.15  }
  117.16  #endif
  117.17  
  117.18 -#endif /* _SDL_visualtest_harness_argparser_h */
  117.19 +#endif /* SDL_visualtest_harness_argparser_h_ */
  117.20 +
  117.21 +/* vi: set ts=4 sw=4 expandtab: */
   118.1 --- a/visualtest/include/SDL_visualtest_mischelper.h	Mon Aug 28 00:11:38 2017 -0700
   118.2 +++ b/visualtest/include/SDL_visualtest_mischelper.h	Mon Aug 28 00:22:23 2017 -0700
   118.3 @@ -4,8 +4,8 @@
   118.4   * Header with miscellaneous helper functions.
   118.5   */
   118.6  
   118.7 -#ifndef _SDL_visualtest_mischelper_h
   118.8 -#define _SDL_visualtest_mischelper_h
   118.9 +#ifndef SDL_visualtest_mischelper_h_
  118.10 +#define SDL_visualtest_mischelper_h_
  118.11  
  118.12  /* Set up for C function definitions, even when using C++ */
  118.13  #ifdef __cplusplus
  118.14 @@ -23,4 +23,6 @@
  118.15  }
  118.16  #endif
  118.17  
  118.18 -#endif /* _SDL_visualtest_mischelper_h */
  118.19 \ No newline at end of file
  118.20 +#endif /* SDL_visualtest_mischelper_h_ */
  118.21 +
  118.22 +/* vi: set ts=4 sw=4 expandtab: */
   119.1 --- a/visualtest/include/SDL_visualtest_parsehelper.h	Mon Aug 28 00:11:38 2017 -0700
   119.2 +++ b/visualtest/include/SDL_visualtest_parsehelper.h	Mon Aug 28 00:22:23 2017 -0700
   119.3 @@ -5,8 +5,8 @@
   119.4   * Header with some helper functions for parsing strings.
   119.5   */
   119.6  
   119.7 -#ifndef _SDL_visualtest_parsehelper_h
   119.8 -#define _SDL_visualtest_parsehelper_h
   119.9 +#ifndef SDL_visualtest_parsehelper_h_
  119.10 +#define SDL_visualtest_parsehelper_h_
  119.11  
  119.12  /* Set up for C function definitions, even when using C++ */
  119.13  #ifdef __cplusplus
  119.14 @@ -41,4 +41,6 @@
  119.15  }
  119.16  #endif
  119.17  
  119.18 -#endif /* _SDL_visualtest_parsehelper_h */
  119.19 +#endif /* SDL_visualtest_parsehelper_h_ */
  119.20 +
  119.21 +/* vi: set ts=4 sw=4 expandtab: */
   120.1 --- a/visualtest/include/SDL_visualtest_process.h	Mon Aug 28 00:11:38 2017 -0700
   120.2 +++ b/visualtest/include/SDL_visualtest_process.h	Mon Aug 28 00:22:23 2017 -0700
   120.3 @@ -16,8 +16,8 @@
   120.4  #error "Unsupported platform."
   120.5  #endif
   120.6  
   120.7 -#ifndef _SDL_visualtest_process_h
   120.8 -#define _SDL_visualtest_process_h
   120.9 +#ifndef SDL_visualtest_process_h_
  120.10 +#define SDL_visualtest_process_h_
  120.11  
  120.12  /* Set up for C function definitions, even when using C++ */
  120.13  #ifdef __cplusplus
  120.14 @@ -107,5 +107,6 @@
  120.15  }
  120.16  #endif
  120.17  
  120.18 -#endif /* _SDL_visualtest_process_h */
  120.19 +#endif /* SDL_visualtest_process_h_ */
  120.20  
  120.21 +/* vi: set ts=4 sw=4 expandtab: */
   121.1 --- a/visualtest/include/SDL_visualtest_random_variator.h	Mon Aug 28 00:11:38 2017 -0700
   121.2 +++ b/visualtest/include/SDL_visualtest_random_variator.h	Mon Aug 28 00:22:23 2017 -0700
   121.3 @@ -8,8 +8,8 @@
   121.4  #include "SDL_visualtest_harness_argparser.h"
   121.5  #include "SDL_visualtest_variator_common.h"
   121.6  
   121.7 -#ifndef _SDL_visualtest_random_variator_h
   121.8 -#define _SDL_visualtest_random_variator_h
   121.9 +#ifndef SDL_visualtest_random_variator_h_
  121.10 +#define SDL_visualtest_random_variator_h_
  121.11  
  121.12  /* Set up for C function definitions, even when using C++ */
  121.13  #ifdef __cplusplus
  121.14 @@ -56,4 +56,6 @@
  121.15  }
  121.16  #endif
  121.17  
  121.18 -#endif /* _SDL_visualtest_random_variator_h */
  121.19 \ No newline at end of file
  121.20 +#endif /* SDL_visualtest_random_variator_h_ */
  121.21 +
  121.22 +/* vi: set ts=4 sw=4 expandtab: */
   122.1 --- a/visualtest/include/SDL_visualtest_rwhelper.h	Mon Aug 28 00:11:38 2017 -0700
   122.2 +++ b/visualtest/include/SDL_visualtest_rwhelper.h	Mon Aug 28 00:22:23 2017 -0700
   122.3 @@ -7,8 +7,8 @@
   122.4  
   122.5  #include <SDL_rwops.h>
   122.6  
   122.7 -#ifndef _SDL_visualtest_rwhelper_h
   122.8 -#define _SDL_visualtest_rwhelper_h
   122.9 +#ifndef SDL_visualtest_rwhelper_h_
  122.10 +#define SDL_visualtest_rwhelper_h_
  122.11  
  122.12  /** Length of the buffer in SDLVisualTest_RWHelperBuffer */
  122.13  #define RWOPS_BUFFER_LEN 256
  122.14 @@ -82,4 +82,6 @@
  122.15  }
  122.16  #endif
  122.17  
  122.18 -#endif /* _SDL_visualtest_rwhelper_h */
  122.19 \ No newline at end of file
  122.20 +#endif /* SDL_visualtest_rwhelper_h_ */
  122.21 +
  122.22 +/* vi: set ts=4 sw=4 expandtab: */
   123.1 --- a/visualtest/include/SDL_visualtest_screenshot.h	Mon Aug 28 00:11:38 2017 -0700
   123.2 +++ b/visualtest/include/SDL_visualtest_screenshot.h	Mon Aug 28 00:22:23 2017 -0700
   123.3 @@ -7,8 +7,8 @@
   123.4  
   123.5  #include "SDL_visualtest_process.h"
   123.6  
   123.7 -#ifndef _SDL_visualtest_screenshot_h
   123.8 -#define _SDL_visualtest_screenshot_h
   123.9 +#ifndef SDL_visualtest_screenshot_h_
  123.10 +#define SDL_visualtest_screenshot_h_
  123.11  
  123.12  /* Set up for C function definitions, even when using C++ */
  123.13  #ifdef __cplusplus
  123.14 @@ -47,4 +47,6 @@
  123.15  }
  123.16  #endif
  123.17  
  123.18 -#endif /* _SDL_visualtest_screenshot_h */
  123.19 \ No newline at end of file
  123.20 +#endif /* SDL_visualtest_screenshot_h_ */
  123.21 +
  123.22 +/* vi: set ts=4 sw=4 expandtab: */
   124.1 --- a/visualtest/include/SDL_visualtest_sut_configparser.h	Mon Aug 28 00:11:38 2017 -0700
   124.2 +++ b/visualtest/include/SDL_visualtest_sut_configparser.h	Mon Aug 28 00:22:23 2017 -0700
   124.3 @@ -5,8 +5,8 @@
   124.4   * Header for the parser for SUT config files.
   124.5   */
   124.6  
   124.7 -#ifndef _SDL_visualtest_sut_configparser_h
   124.8 -#define _SDL_visualtest_sut_configparser_h
   124.9 +#ifndef SDL_visualtest_sut_configparser_h_
  124.10 +#define SDL_visualtest_sut_configparser_h_
  124.11  
  124.12  /** Maximum length of the name of an SUT option */
  124.13  #define MAX_SUTOPTION_NAME_LEN 100
  124.14 @@ -100,4 +100,6 @@
  124.15  }
  124.16  #endif
  124.17  
  124.18 -#endif /* _SDL_visualtest_sut_configparser_h */
  124.19 +#endif /* SDL_visualtest_sut_configparser_h_ */
  124.20 +
  124.21 +/* vi: set ts=4 sw=4 expandtab: */
   125.1 --- a/visualtest/include/SDL_visualtest_variator_common.h	Mon Aug 28 00:11:38 2017 -0700
   125.2 +++ b/visualtest/include/SDL_visualtest_variator_common.h	Mon Aug 28 00:22:23 2017 -0700
   125.3 @@ -8,8 +8,8 @@
   125.4  #include <SDL_types.h>
   125.5  #include "SDL_visualtest_sut_configparser.h"
   125.6  
   125.7 -#ifndef _SDL_visualtest_variator_common_h
   125.8 -#define _SDL_visualtest_variator_common_h
   125.9 +#ifndef SDL_visualtest_variator_common_h_
  125.10 +#define SDL_visualtest_variator_common_h_
  125.11  
  125.12  /** The number of variations one integer option would generate */
  125.13  #define SDL_SUT_INTEGER_OPTION_TEST_STEPS 3
  125.14 @@ -117,4 +117,6 @@
  125.15  }
  125.16  #endif
  125.17  
  125.18 -#endif /* _SDL_visualtest_variator_common_h */
  125.19 \ No newline at end of file
  125.20 +#endif /* SDL_visualtest_variator_common_h_ */
  125.21 +
  125.22 +/* vi: set ts=4 sw=4 expandtab: */
   126.1 --- a/visualtest/include/SDL_visualtest_variators.h	Mon Aug 28 00:11:38 2017 -0700
   126.2 +++ b/visualtest/include/SDL_visualtest_variators.h	Mon Aug 28 00:22:23 2017 -0700
   126.3 @@ -8,8 +8,8 @@
   126.4  #include "SDL_visualtest_exhaustive_variator.h"
   126.5  #include "SDL_visualtest_random_variator.h"
   126.6  
   126.7 -#ifndef _SDL_visualtest_variators_h
   126.8 -#define _SDL_visualtest_variators_h
   126.9 +#ifndef SDL_visualtest_variators_h_
  126.10 +#define SDL_visualtest_variators_h_
  126.11  
  126.12  /* Set up for C function definitions, even when using C++ */
  126.13  #ifdef __cplusplus
  126.14 @@ -61,4 +61,6 @@
  126.15  }
  126.16  #endif
  126.17  
  126.18 -#endif /* _SDL_visualtest_variators_h */
  126.19 \ No newline at end of file
  126.20 +#endif /* SDL_visualtest_variators_h_ */
  126.21 +
  126.22 +/* vi: set ts=4 sw=4 expandtab: */