Add and update include guards
authorMichał Janiszewski <janisozaur+sdl2image@gmail.com>
Sun, 28 Oct 2018 21:36:48 +0100
changeset 12366c46e72bd9950
parent 12365 09e3ef028bc8
child 12368 9bb50edccc46
Add and update include guards

Include guards in most changed files were missing, I added them keeping
the same style as other SDL files. In some cases I moved the include
guards around to be the first thing the header has to take advantage of
any possible improvements compiler may have for inclusion guards.
src/SDL_assert_c.h
src/audio/SDL_audiodev_c.h
src/core/linux/SDL_evdev_kbd.h
src/events/SDL_events_c.h
src/events/scancodes_xfree86.h
src/haptic/SDL_haptic_c.h
src/joystick/SDL_joystick_c.h
src/joystick/linux/SDL_sysjoystick_c.h
src/joystick/steam/SDL_steamcontroller.h
src/libm/math_libm.h
src/render/SDL_yuv_sw_c.h
src/render/opengl/SDL_shaders_gl.h
src/render/software/SDL_blendfillrect.h
src/render/software/SDL_blendline.h
src/render/software/SDL_blendpoint.h
src/render/software/SDL_drawline.h
src/render/software/SDL_drawpoint.h
src/render/software/SDL_render_sw_c.h
src/render/software/SDL_rotate.h
src/sensor/SDL_sensor_c.h
src/sensor/SDL_syssensor.h
src/timer/SDL_timer_c.h
src/video/SDL_RLEaccel_c.h
src/video/SDL_blit_copy.h
src/video/SDL_blit_slow.h
src/video/SDL_pixels_c.h
src/video/SDL_rect_c.h
src/video/SDL_yuv_c.h
src/video/dummy/SDL_nullevents_c.h
src/video/dummy/SDL_nullframebuffer_c.h
src/video/wayland/SDL_waylandtouch.h
src/video/x11/SDL_x11framebuffer.h
src/video/x11/SDL_x11messagebox.h
     1.1 --- a/src/SDL_assert_c.h	Sun Oct 28 14:17:21 2018 -0700
     1.2 +++ b/src/SDL_assert_c.h	Sun Oct 28 21:36:48 2018 +0100
     1.3 @@ -19,6 +19,11 @@
     1.4    3. This notice may not be removed or altered from any source distribution.
     1.5  */
     1.6  
     1.7 +#ifndef SDL_assert_c_h_
     1.8 +#define SDL_assert_c_h_
     1.9 +
    1.10  extern void SDL_AssertionsQuit(void);
    1.11  
    1.12 +#endif /* SDL_assert_c_h_ */
    1.13 +
    1.14  /* vi: set ts=4 sw=4 expandtab: */
     2.1 --- a/src/audio/SDL_audiodev_c.h	Sun Oct 28 14:17:21 2018 -0700
     2.2 +++ b/src/audio/SDL_audiodev_c.h	Sun Oct 28 21:36:48 2018 +0100
     2.3 @@ -18,6 +18,10 @@
     2.4       misrepresented as being the original software.
     2.5    3. This notice may not be removed or altered from any source distribution.
     2.6  */
     2.7 +
     2.8 +#ifndef SDL_audiodev_c_h_
     2.9 +#define SDL_audiodev_c_h_
    2.10 +
    2.11  #include "SDL.h"
    2.12  #include "../SDL_internal.h"
    2.13  #include "SDL_sysaudio.h"
    2.14 @@ -35,4 +39,6 @@
    2.15  
    2.16  extern void SDL_EnumUnixAudioDevices(const int classic, int (*test)(int));
    2.17  
    2.18 +#endif /* SDL_audiodev_c_h_ */
    2.19 +
    2.20  /* vi: set ts=4 sw=4 expandtab: */
     3.1 --- a/src/core/linux/SDL_evdev_kbd.h	Sun Oct 28 14:17:21 2018 -0700
     3.2 +++ b/src/core/linux/SDL_evdev_kbd.h	Sun Oct 28 21:36:48 2018 +0100
     3.3 @@ -19,6 +19,9 @@
     3.4    3. This notice may not be removed or altered from any source distribution.
     3.5  */
     3.6  
     3.7 +#ifndef SDL_evdev_kbd_h_
     3.8 +#define SDL_evdev_kbd_h_
     3.9 +
    3.10  struct SDL_EVDEV_keyboard_state;
    3.11  typedef struct SDL_EVDEV_keyboard_state SDL_EVDEV_keyboard_state;
    3.12  
    3.13 @@ -26,4 +29,6 @@
    3.14  extern void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int keycode, int down);
    3.15  extern void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *state);
    3.16  
    3.17 +#endif /* SDL_evdev_kbd_h_ */
    3.18 +
    3.19  /* vi: set ts=4 sw=4 expandtab: */
     4.1 --- a/src/events/SDL_events_c.h	Sun Oct 28 14:17:21 2018 -0700
     4.2 +++ b/src/events/SDL_events_c.h	Sun Oct 28 21:36:48 2018 +0100
     4.3 @@ -18,6 +18,10 @@
     4.4       misrepresented as being the original software.
     4.5    3. This notice may not be removed or altered from any source distribution.
     4.6  */
     4.7 +
     4.8 +#ifndef SDL_events_c_h_
     4.9 +#define SDL_events_c_h_
    4.10 +
    4.11  #include "../SDL_internal.h"
    4.12  
    4.13  /* Useful functions and variables from SDL_events.c */
    4.14 @@ -49,4 +53,6 @@
    4.15  
    4.16  extern void SDL_SendPendingQuit(void);
    4.17  
    4.18 +#endif /* SDL_events_c_h_ */
    4.19 +
    4.20  /* vi: set ts=4 sw=4 expandtab: */
     5.1 --- a/src/events/scancodes_xfree86.h	Sun Oct 28 14:17:21 2018 -0700
     5.2 +++ b/src/events/scancodes_xfree86.h	Sun Oct 28 21:36:48 2018 +0100
     5.3 @@ -18,6 +18,10 @@
     5.4       misrepresented as being the original software.
     5.5    3. This notice may not be removed or altered from any source distribution.
     5.6  */
     5.7 +
     5.8 +#ifndef scancodes_xfree86_h_
     5.9 +#define scancodes_xfree86_h_
    5.10 +
    5.11  #include "../../include/SDL_scancode.h"
    5.12  
    5.13  /* XFree86 key code to SDL scancode mapping table
    5.14 @@ -503,4 +507,6 @@
    5.15      /*  80 */   SDL_SCANCODE_F12,
    5.16  };
    5.17  
    5.18 +#endif /* scancodes_xfree86_h_ */
    5.19 +
    5.20  /* *INDENT-ON* */
     6.1 --- a/src/haptic/SDL_haptic_c.h	Sun Oct 28 14:17:21 2018 -0700
     6.2 +++ b/src/haptic/SDL_haptic_c.h	Sun Oct 28 21:36:48 2018 +0100
     6.3 @@ -19,7 +19,12 @@
     6.4    3. This notice may not be removed or altered from any source distribution.
     6.5  */
     6.6  
     6.7 +#ifndef SDL_haptic_c_h_
     6.8 +#define SDL_haptic_c_h_
     6.9 +
    6.10  extern int SDL_HapticInit(void);
    6.11  extern void SDL_HapticQuit(void);
    6.12  
    6.13 +#endif /* SDL_haptic_c_h_ */
    6.14 +
    6.15  /* vi: set ts=4 sw=4 expandtab: */
     7.1 --- a/src/joystick/SDL_joystick_c.h	Sun Oct 28 14:17:21 2018 -0700
     7.2 +++ b/src/joystick/SDL_joystick_c.h	Sun Oct 28 21:36:48 2018 +0100
     7.3 @@ -18,6 +18,10 @@
     7.4       misrepresented as being the original software.
     7.5    3. This notice may not be removed or altered from any source distribution.
     7.6  */
     7.7 +
     7.8 +#ifndef SDL_joystick_c_h_
     7.9 +#define SDL_joystick_c_h_
    7.10 +
    7.11  #include "../SDL_internal.h"
    7.12  
    7.13  /* Useful functions and variables from SDL_joystick.c */
    7.14 @@ -97,4 +101,6 @@
    7.15  /* Internal sanity checking functions */
    7.16  extern int SDL_PrivateJoystickValid(SDL_Joystick * joystick);
    7.17  
    7.18 +#endif /* SDL_joystick_c_h_ */
    7.19 +
    7.20  /* vi: set ts=4 sw=4 expandtab: */
     8.1 --- a/src/joystick/linux/SDL_sysjoystick_c.h	Sun Oct 28 14:17:21 2018 -0700
     8.2 +++ b/src/joystick/linux/SDL_sysjoystick_c.h	Sun Oct 28 21:36:48 2018 +0100
     8.3 @@ -19,6 +19,9 @@
     8.4    3. This notice may not be removed or altered from any source distribution.
     8.5  */
     8.6  
     8.7 +#ifndef SDL_sysjoystick_c_h_
     8.8 +#define SDL_sysjoystick_c_h_
     8.9 +
    8.10  #include <linux/input.h>
    8.11  
    8.12  struct SDL_joylist_item;
    8.13 @@ -61,4 +64,6 @@
    8.14      SDL_bool m_bSteamController;
    8.15  };
    8.16  
    8.17 +#endif /* SDL_sysjoystick_c_h_ */
    8.18 +
    8.19  /* vi: set ts=4 sw=4 expandtab: */
     9.1 --- a/src/joystick/steam/SDL_steamcontroller.h	Sun Oct 28 14:17:21 2018 -0700
     9.2 +++ b/src/joystick/steam/SDL_steamcontroller.h	Sun Oct 28 21:36:48 2018 +0100
     9.3 @@ -18,6 +18,10 @@
     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 +
     9.8 +#ifndef SDL_steamcontroller_h_
     9.9 +#define SDL_steamcontroller_h_
    9.10 +
    9.11  #include "../../SDL_internal.h"
    9.12  
    9.13  typedef SDL_bool (*SteamControllerConnectedCallback_t)(const char *name, SDL_JoystickGUID guid, int *device_instance);
    9.14 @@ -30,4 +34,6 @@
    9.15  void SDL_UpdateSteamController(SDL_Joystick *joystick);
    9.16  void SDL_QuitSteamControllers(void);
    9.17  
    9.18 +#endif /* SDL_steamcontroller_h_ */
    9.19 +
    9.20  /* vi: set ts=4 sw=4 expandtab: */
    10.1 --- a/src/libm/math_libm.h	Sun Oct 28 14:17:21 2018 -0700
    10.2 +++ b/src/libm/math_libm.h	Sun Oct 28 21:36:48 2018 +0100
    10.3 @@ -18,6 +18,10 @@
    10.4       misrepresented as being the original software.
    10.5    3. This notice may not be removed or altered from any source distribution.
    10.6  */
    10.7 +
    10.8 +#ifndef math_libm_h_
    10.9 +#define math_libm_h_
   10.10 +
   10.11  #include "../SDL_internal.h"
   10.12  
   10.13  /* Math routines from uClibc: http://www.uclibc.org */
   10.14 @@ -38,4 +42,6 @@
   10.15  double SDL_uclibc_sqrt(double x);
   10.16  double SDL_uclibc_tan(double x);
   10.17  
   10.18 +#endif /* math_libm_h_ */
   10.19 +
   10.20  /* vi: set ts=4 sw=4 expandtab: */
    11.1 --- a/src/render/SDL_yuv_sw_c.h	Sun Oct 28 14:17:21 2018 -0700
    11.2 +++ b/src/render/SDL_yuv_sw_c.h	Sun Oct 28 21:36:48 2018 +0100
    11.3 @@ -18,6 +18,10 @@
    11.4       misrepresented as being the original software.
    11.5    3. This notice may not be removed or altered from any source distribution.
    11.6  */
    11.7 +
    11.8 +#ifndef SDL_yuv_sw_c_h_
    11.9 +#define SDL_yuv_sw_c_h_
   11.10 +
   11.11  #include "../SDL_internal.h"
   11.12  
   11.13  #include "SDL_video.h"
   11.14 @@ -64,4 +68,6 @@
   11.15  #define USE_MMX_ASSEMBLY 1
   11.16  #endif
   11.17  
   11.18 +#endif /* SDL_yuv_sw_c_h_ */
   11.19 +
   11.20  /* vi: set ts=4 sw=4 expandtab: */
    12.1 --- a/src/render/opengl/SDL_shaders_gl.h	Sun Oct 28 14:17:21 2018 -0700
    12.2 +++ b/src/render/opengl/SDL_shaders_gl.h	Sun Oct 28 21:36:48 2018 +0100
    12.3 @@ -18,6 +18,10 @@
    12.4       misrepresented as being the original software.
    12.5    3. This notice may not be removed or altered from any source distribution.
    12.6  */
    12.7 +
    12.8 +#ifndef SDL_shaders_gl_h_
    12.9 +#define SDL_shaders_gl_h_
   12.10 +
   12.11  #include "../../SDL_internal.h"
   12.12  
   12.13  /* OpenGL shader implementation */
   12.14 @@ -44,4 +48,6 @@
   12.15  extern void GL_SelectShader(GL_ShaderContext *ctx, GL_Shader shader);
   12.16  extern void GL_DestroyShaderContext(GL_ShaderContext *ctx);
   12.17  
   12.18 +#endif /* SDL_shaders_gl_h_ */
   12.19 +
   12.20  /* vi: set ts=4 sw=4 expandtab: */
    13.1 --- a/src/render/software/SDL_blendfillrect.h	Sun Oct 28 14:17:21 2018 -0700
    13.2 +++ b/src/render/software/SDL_blendfillrect.h	Sun Oct 28 21:36:48 2018 +0100
    13.3 @@ -18,10 +18,16 @@
    13.4       misrepresented as being the original software.
    13.5    3. This notice may not be removed or altered from any source distribution.
    13.6  */
    13.7 +
    13.8 +#ifndef SDL_blendfillrect_h_
    13.9 +#define SDL_blendfillrect_h_
   13.10 +
   13.11  #include "../../SDL_internal.h"
   13.12  
   13.13  
   13.14  extern int SDL_BlendFillRect(SDL_Surface * dst, const SDL_Rect * rect, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   13.15  extern int SDL_BlendFillRects(SDL_Surface * dst, const SDL_Rect * rects, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   13.16  
   13.17 +#endif /* SDL_blendfillrect_h_ */
   13.18 +
   13.19  /* vi: set ts=4 sw=4 expandtab: */
    14.1 --- a/src/render/software/SDL_blendline.h	Sun Oct 28 14:17:21 2018 -0700
    14.2 +++ b/src/render/software/SDL_blendline.h	Sun Oct 28 21:36:48 2018 +0100
    14.3 @@ -18,10 +18,16 @@
    14.4       misrepresented as being the original software.
    14.5    3. This notice may not be removed or altered from any source distribution.
    14.6  */
    14.7 +
    14.8 +#ifndef SDL_blendline_h_
    14.9 +#define SDL_blendline_h_
   14.10 +
   14.11  #include "../../SDL_internal.h"
   14.12  
   14.13  
   14.14  extern int SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   14.15  extern int SDL_BlendLines(SDL_Surface * dst, const SDL_Point * points, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   14.16  
   14.17 +#endif /* SDL_blendline_h_ */
   14.18 +
   14.19  /* vi: set ts=4 sw=4 expandtab: */
    15.1 --- a/src/render/software/SDL_blendpoint.h	Sun Oct 28 14:17:21 2018 -0700
    15.2 +++ b/src/render/software/SDL_blendpoint.h	Sun Oct 28 21:36:48 2018 +0100
    15.3 @@ -18,10 +18,16 @@
    15.4       misrepresented as being the original software.
    15.5    3. This notice may not be removed or altered from any source distribution.
    15.6  */
    15.7 +
    15.8 +#ifndef SDL_blendpoint_h_
    15.9 +#define SDL_blendpoint_h_
   15.10 +
   15.11  #include "../../SDL_internal.h"
   15.12  
   15.13  
   15.14  extern int SDL_BlendPoint(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   15.15  extern int SDL_BlendPoints(SDL_Surface * dst, const SDL_Point * points, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   15.16  
   15.17 +#endif /* SDL_blendpoint_h_ */
   15.18 +
   15.19  /* vi: set ts=4 sw=4 expandtab: */
    16.1 --- a/src/render/software/SDL_drawline.h	Sun Oct 28 14:17:21 2018 -0700
    16.2 +++ b/src/render/software/SDL_drawline.h	Sun Oct 28 21:36:48 2018 +0100
    16.3 @@ -18,10 +18,16 @@
    16.4       misrepresented as being the original software.
    16.5    3. This notice may not be removed or altered from any source distribution.
    16.6  */
    16.7 +
    16.8 +#ifndef SDL_drawline_h_
    16.9 +#define SDL_drawline_h_
   16.10 +
   16.11  #include "../../SDL_internal.h"
   16.12  
   16.13  
   16.14  extern int SDL_DrawLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color);
   16.15  extern int SDL_DrawLines(SDL_Surface * dst, const SDL_Point * points, int count, Uint32 color);
   16.16  
   16.17 +#endif /* SDL_drawline_h_ */
   16.18 +
   16.19  /* vi: set ts=4 sw=4 expandtab: */
    17.1 --- a/src/render/software/SDL_drawpoint.h	Sun Oct 28 14:17:21 2018 -0700
    17.2 +++ b/src/render/software/SDL_drawpoint.h	Sun Oct 28 21:36:48 2018 +0100
    17.3 @@ -18,10 +18,16 @@
    17.4       misrepresented as being the original software.
    17.5    3. This notice may not be removed or altered from any source distribution.
    17.6  */
    17.7 +
    17.8 +#ifndef SDL_drawpoint_h_
    17.9 +#define SDL_drawpoint_h_
   17.10 +
   17.11  #include "../../SDL_internal.h"
   17.12  
   17.13  
   17.14  extern int SDL_DrawPoint(SDL_Surface * dst, int x, int y, Uint32 color);
   17.15  extern int SDL_DrawPoints(SDL_Surface * dst, const SDL_Point * points, int count, Uint32 color);
   17.16  
   17.17 +#endif /* SDL_drawpoint_h_ */
   17.18 +
   17.19  /* vi: set ts=4 sw=4 expandtab: */
    18.1 --- a/src/render/software/SDL_render_sw_c.h	Sun Oct 28 14:17:21 2018 -0700
    18.2 +++ b/src/render/software/SDL_render_sw_c.h	Sun Oct 28 21:36:48 2018 +0100
    18.3 @@ -19,6 +19,11 @@
    18.4    3. This notice may not be removed or altered from any source distribution.
    18.5  */
    18.6  
    18.7 +#ifndef SDL_render_sw_c_h_
    18.8 +#define SDL_render_sw_c_h_
    18.9 +
   18.10  extern SDL_Renderer * SW_CreateRendererForSurface(SDL_Surface * surface);
   18.11  
   18.12 +#endif /* SDL_render_sw_c_h_ */
   18.13 +
   18.14  /* vi: set ts=4 sw=4 expandtab: */
    19.1 --- a/src/render/software/SDL_rotate.h	Sun Oct 28 14:17:21 2018 -0700
    19.2 +++ b/src/render/software/SDL_rotate.h	Sun Oct 28 21:36:48 2018 +0100
    19.3 @@ -19,6 +19,9 @@
    19.4    3. This notice may not be removed or altered from any source distribution.
    19.5  */
    19.6  
    19.7 +#ifndef SDL_rotate_h_
    19.8 +#define SDL_rotate_h_
    19.9 +
   19.10  #ifndef MIN
   19.11  #define MIN(a,b)    (((a) < (b)) ? (a) : (b))
   19.12  #endif
   19.13 @@ -26,3 +29,4 @@
   19.14  extern SDL_Surface *SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle);
   19.15  extern void SDLgfx_rotozoomSurfaceSizeTrig(int width, int height, double angle, int *dstwidth, int *dstheight, double *cangle, double *sangle);
   19.16  
   19.17 +#endif /* SDL_rotate_h_ */
    20.1 --- a/src/sensor/SDL_sensor_c.h	Sun Oct 28 14:17:21 2018 -0700
    20.2 +++ b/src/sensor/SDL_sensor_c.h	Sun Oct 28 21:36:48 2018 +0100
    20.3 @@ -18,6 +18,10 @@
    20.4       misrepresented as being the original software.
    20.5    3. This notice may not be removed or altered from any source distribution.
    20.6  */
    20.7 +
    20.8 +#ifndef SDL_sensor_c_h_
    20.9 +#define SDL_sensor_c_h_
   20.10 +
   20.11  #include "SDL_config.h"
   20.12  
   20.13  struct _SDL_SensorDriver;
   20.14 @@ -35,4 +39,6 @@
   20.15  /* Internal event queueing functions */
   20.16  extern int SDL_PrivateSensorUpdate(SDL_Sensor *sensor, float *data, int num_values);
   20.17  
   20.18 +#endif /* SDL_sensor_c_h_ */
   20.19 +
   20.20  /* vi: set ts=4 sw=4 expandtab: */
    21.1 --- a/src/sensor/SDL_syssensor.h	Sun Oct 28 14:17:21 2018 -0700
    21.2 +++ b/src/sensor/SDL_syssensor.h	Sun Oct 28 21:36:48 2018 +0100
    21.3 @@ -18,6 +18,10 @@
    21.4       misrepresented as being the original software.
    21.5    3. This notice may not be removed or altered from any source distribution.
    21.6  */
    21.7 +
    21.8 +#ifndef SDL_syssensor_c_h_
    21.9 +#define SDL_syssensor_c_h_
   21.10 +
   21.11  #include "SDL_config.h"
   21.12  
   21.13  /* This is the system specific header for the SDL sensor API */
   21.14 @@ -96,4 +100,6 @@
   21.15  extern SDL_SensorDriver SDL_COREMOTION_SensorDriver;
   21.16  extern SDL_SensorDriver SDL_DUMMY_SensorDriver;
   21.17  
   21.18 +#endif /* SDL_syssensor_c_h_ */
   21.19 +
   21.20  /* vi: set ts=4 sw=4 expandtab: */
    22.1 --- a/src/timer/SDL_timer_c.h	Sun Oct 28 14:17:21 2018 -0700
    22.2 +++ b/src/timer/SDL_timer_c.h	Sun Oct 28 21:36:48 2018 +0100
    22.3 @@ -18,6 +18,10 @@
    22.4       misrepresented as being the original software.
    22.5    3. This notice may not be removed or altered from any source distribution.
    22.6  */
    22.7 +
    22.8 +#ifndef SDL_timer_c_h_
    22.9 +#define SDL_timer_c_h_
   22.10 +
   22.11  #include "../SDL_internal.h"
   22.12  
   22.13  /* Useful functions and variables from SDL_timer.c */
   22.14 @@ -31,4 +35,6 @@
   22.15  extern int SDL_TimerInit(void);
   22.16  extern void SDL_TimerQuit(void);
   22.17  
   22.18 +#endif /* SDL_timer_c_h_ */
   22.19 +
   22.20  /* vi: set ts=4 sw=4 expandtab: */
    23.1 --- a/src/video/SDL_RLEaccel_c.h	Sun Oct 28 14:17:21 2018 -0700
    23.2 +++ b/src/video/SDL_RLEaccel_c.h	Sun Oct 28 21:36:48 2018 +0100
    23.3 @@ -18,6 +18,10 @@
    23.4       misrepresented as being the original software.
    23.5    3. This notice may not be removed or altered from any source distribution.
    23.6  */
    23.7 +
    23.8 +#ifndef SDL_RLEaccel_c_h_
    23.9 +#define SDL_RLEaccel_c_h_
   23.10 +
   23.11  #include "../SDL_internal.h"
   23.12  
   23.13  /* Useful functions and variables from SDL_RLEaccel.c */
   23.14 @@ -28,4 +32,7 @@
   23.15  extern int SDLCALL SDL_RLEAlphaBlit(SDL_Surface * src, SDL_Rect * srcrect,
   23.16                                      SDL_Surface * dst, SDL_Rect * dstrect);
   23.17  extern void SDL_UnRLESurface(SDL_Surface * surface, int recode);
   23.18 +
   23.19 +#endif /* SDL_RLEaccel_c_h_ */
   23.20 +
   23.21  /* vi: set ts=4 sw=4 expandtab: */
    24.1 --- a/src/video/SDL_blit_copy.h	Sun Oct 28 14:17:21 2018 -0700
    24.2 +++ b/src/video/SDL_blit_copy.h	Sun Oct 28 21:36:48 2018 +0100
    24.3 @@ -19,6 +19,11 @@
    24.4    3. This notice may not be removed or altered from any source distribution.
    24.5  */
    24.6  
    24.7 +#ifndef SDL_blit_copy_h_
    24.8 +#define SDL_blit_copy_h_
    24.9 +
   24.10  void SDL_BlitCopy(SDL_BlitInfo * info);
   24.11  
   24.12 +#endif /* SDL_blit_copy_h_ */
   24.13 +
   24.14  /* vi: set ts=4 sw=4 expandtab: */
    25.1 --- a/src/video/SDL_blit_slow.h	Sun Oct 28 14:17:21 2018 -0700
    25.2 +++ b/src/video/SDL_blit_slow.h	Sun Oct 28 21:36:48 2018 +0100
    25.3 @@ -18,8 +18,14 @@
    25.4       misrepresented as being the original software.
    25.5    3. This notice may not be removed or altered from any source distribution.
    25.6  */
    25.7 +
    25.8 +#ifndef SDL_blit_slow_h_
    25.9 +#define SDL_blit_slow_h_
   25.10 +
   25.11  #include "../SDL_internal.h"
   25.12  
   25.13  extern void SDL_Blit_Slow(SDL_BlitInfo * info);
   25.14  
   25.15 +#endif /* SDL_blit_slow_h_ */
   25.16 +
   25.17  /* vi: set ts=4 sw=4 expandtab: */
    26.1 --- a/src/video/SDL_pixels_c.h	Sun Oct 28 14:17:21 2018 -0700
    26.2 +++ b/src/video/SDL_pixels_c.h	Sun Oct 28 21:36:48 2018 +0100
    26.3 @@ -18,6 +18,10 @@
    26.4       misrepresented as being the original software.
    26.5    3. This notice may not be removed or altered from any source distribution.
    26.6  */
    26.7 +
    26.8 +#ifndef SDL_pixels_c_h_
    26.9 +#define SDL_pixels_c_h_
   26.10 +
   26.11  #include "../SDL_internal.h"
   26.12  
   26.13  /* Useful functions and variables from SDL_pixel.c */
   26.14 @@ -37,4 +41,6 @@
   26.15  extern void SDL_DitherColors(SDL_Color * colors, int bpp);
   26.16  extern Uint8 SDL_FindColor(SDL_Palette * pal, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   26.17  
   26.18 +#endif /* SDL_pixels_c_h_ */
   26.19 +
   26.20  /* vi: set ts=4 sw=4 expandtab: */
    27.1 --- a/src/video/SDL_rect_c.h	Sun Oct 28 14:17:21 2018 -0700
    27.2 +++ b/src/video/SDL_rect_c.h	Sun Oct 28 21:36:48 2018 +0100
    27.3 @@ -18,8 +18,14 @@
    27.4       misrepresented as being the original software.
    27.5    3. This notice may not be removed or altered from any source distribution.
    27.6  */
    27.7 +
    27.8 +#ifndef SDL_rect_c_h_
    27.9 +#define SDL_rect_c_h_
   27.10 +
   27.11  #include "../SDL_internal.h"
   27.12  
   27.13  extern SDL_bool SDL_GetSpanEnclosingRect(int width, int height, int numrects, const SDL_Rect * rects, SDL_Rect *span);
   27.14  
   27.15 +#endif /* SDL_rect_c_h_ */
   27.16 +
   27.17  /* vi: set ts=4 sw=4 expandtab: */
    28.1 --- a/src/video/SDL_yuv_c.h	Sun Oct 28 14:17:21 2018 -0700
    28.2 +++ b/src/video/SDL_yuv_c.h	Sun Oct 28 21:36:48 2018 +0100
    28.3 @@ -18,6 +18,10 @@
    28.4       misrepresented as being the original software.
    28.5    3. This notice may not be removed or altered from any source distribution.
    28.6  */
    28.7 +
    28.8 +#ifndef SDL_yuv_c_h_
    28.9 +#define SDL_yuv_c_h_
   28.10 +
   28.11  #include "../SDL_internal.h"
   28.12  
   28.13  
   28.14 @@ -27,4 +31,6 @@
   28.15  extern int SDL_ConvertPixels_RGB_to_YUV(int width, int height, Uint32 src_format, const void *src, int src_pitch, Uint32 dst_format, void *dst, int dst_pitch);
   28.16  extern int SDL_ConvertPixels_YUV_to_YUV(int width, int height, Uint32 src_format, const void *src, int src_pitch, Uint32 dst_format, void *dst, int dst_pitch);
   28.17  
   28.18 +#endif /* SDL_yuv_c_h_ */
   28.19 +
   28.20  /* vi: set ts=4 sw=4 expandtab: */
    29.1 --- a/src/video/dummy/SDL_nullevents_c.h	Sun Oct 28 14:17:21 2018 -0700
    29.2 +++ b/src/video/dummy/SDL_nullevents_c.h	Sun Oct 28 21:36:48 2018 +0100
    29.3 @@ -18,10 +18,16 @@
    29.4       misrepresented as being the original software.
    29.5    3. This notice may not be removed or altered from any source distribution.
    29.6  */
    29.7 +
    29.8 +#ifndef SDL_nullevents_c_h_
    29.9 +#define SDL_nullevents_c_h_
   29.10 +
   29.11  #include "../../SDL_internal.h"
   29.12  
   29.13  #include "SDL_nullvideo.h"
   29.14  
   29.15  extern void DUMMY_PumpEvents(_THIS);
   29.16  
   29.17 +#endif /* SDL_nullevents_c_h_ */
   29.18 +
   29.19  /* vi: set ts=4 sw=4 expandtab: */
    30.1 --- a/src/video/dummy/SDL_nullframebuffer_c.h	Sun Oct 28 14:17:21 2018 -0700
    30.2 +++ b/src/video/dummy/SDL_nullframebuffer_c.h	Sun Oct 28 21:36:48 2018 +0100
    30.3 @@ -18,10 +18,16 @@
    30.4       misrepresented as being the original software.
    30.5    3. This notice may not be removed or altered from any source distribution.
    30.6  */
    30.7 +
    30.8 +#ifndef SDL_nullframebuffer_c_h_
    30.9 +#define SDL_nullframebuffer_c_h_
   30.10 +
   30.11  #include "../../SDL_internal.h"
   30.12  
   30.13  extern int SDL_DUMMY_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
   30.14  extern int SDL_DUMMY_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
   30.15  extern void SDL_DUMMY_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
   30.16  
   30.17 +#endif /* SDL_nullframebuffer_c_h_ */
   30.18 +
   30.19  /* vi: set ts=4 sw=4 expandtab: */
    31.1 --- a/src/video/wayland/SDL_waylandtouch.h	Sun Oct 28 14:17:21 2018 -0700
    31.2 +++ b/src/video/wayland/SDL_waylandtouch.h	Sun Oct 28 21:36:48 2018 +0100
    31.3 @@ -19,13 +19,13 @@
    31.4    3. This notice may not be removed or altered from any source distribution.
    31.5  */
    31.6  
    31.7 +#ifndef SDL_waylandtouch_h_
    31.8 +#define SDL_waylandtouch_h_
    31.9 +
   31.10  #include "../../SDL_internal.h"
   31.11  
   31.12  #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
   31.13  
   31.14 -#ifndef SDL_waylandtouch_h_
   31.15 -#define SDL_waylandtouch_h_
   31.16 -
   31.17  #include "SDL_waylandvideo.h"
   31.18  #include <stdint.h>
   31.19  #include <stddef.h>
   31.20 @@ -347,6 +347,6 @@
   31.21               QT_WINDOWMANAGER_OPEN_URL, remaining, url);
   31.22  }
   31.23  
   31.24 +#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
   31.25 +
   31.26  #endif /* SDL_waylandtouch_h_ */
   31.27 -
   31.28 -#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
    32.1 --- a/src/video/x11/SDL_x11framebuffer.h	Sun Oct 28 14:17:21 2018 -0700
    32.2 +++ b/src/video/x11/SDL_x11framebuffer.h	Sun Oct 28 21:36:48 2018 +0100
    32.3 @@ -18,6 +18,10 @@
    32.4       misrepresented as being the original software.
    32.5    3. This notice may not be removed or altered from any source distribution.
    32.6  */
    32.7 +
    32.8 +#ifndef SDL_x11framebuffer_h_
    32.9 +#define SDL_x11framebuffer_h_
   32.10 +
   32.11  #include "../../SDL_internal.h"
   32.12  
   32.13  
   32.14 @@ -28,4 +32,6 @@
   32.15                                         const SDL_Rect * rects, int numrects);
   32.16  extern void X11_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
   32.17  
   32.18 +#endif /* SDL_x11framebuffer_h_ */
   32.19 +
   32.20  /* vi: set ts=4 sw=4 expandtab: */
    33.1 --- a/src/video/x11/SDL_x11messagebox.h	Sun Oct 28 14:17:21 2018 -0700
    33.2 +++ b/src/video/x11/SDL_x11messagebox.h	Sun Oct 28 21:36:48 2018 +0100
    33.3 @@ -19,10 +19,15 @@
    33.4    3. This notice may not be removed or altered from any source distribution.
    33.5  */
    33.6  
    33.7 +#ifndef SDL_x11messagebox_h_
    33.8 +#define SDL_x11messagebox_h_
    33.9 +
   33.10  #if SDL_VIDEO_DRIVER_X11
   33.11  
   33.12  extern int X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
   33.13  
   33.14  #endif /* SDL_VIDEO_DRIVER_X11 */
   33.15  
   33.16 +#endif /* SDL_x11messagebox_h_ */
   33.17 +
   33.18  /* vi: set ts=4 sw=4 expandtab: */