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

src/video/wayland/SDL_waylandclipboard.h

@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandclipboard_h
-#define _SDL_waylandclipboard_h
+#ifndef SDL_waylandclipboard_h_
+#define SDL_waylandclipboard_h_
 
 extern int Wayland_SetClipboardText(_THIS, const char *text);
 extern char *Wayland_GetClipboardText(_THIS);
 extern SDL_bool Wayland_HasClipboardText(_THIS);
 
-#endif /* _SDL_waylandclipboard_h */
+#endif /* SDL_waylandclipboard_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/video/wayland/SDL_waylanddatamanager.h

@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylanddatamanager_h
-#define _SDL_waylanddatamanager_h
+#ifndef SDL_waylanddatamanager_h_
+#define SDL_waylanddatamanager_h_
 
 #include "SDL_waylandvideo.h"
 #include "SDL_waylandwindow.h"
@@ -97,9 +97,7 @@ extern int Wayland_data_device_set_selection(SDL_WaylandDataDevice *device,
                                              SDL_WaylandDataSource *source);
 extern int Wayland_data_device_set_serial(SDL_WaylandDataDevice *device,
                                           uint32_t serial);
-#endif /* _SDL_waylanddatamanager_h */
+#endif /* SDL_waylanddatamanager_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
 
-
-

src/video/wayland/SDL_waylanddyn.h

@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_waylanddyn_h
-#define _SDL_waylanddyn_h
+#ifndef SDL_waylanddyn_h_
+#define SDL_waylanddyn_h_
 
 #include "../../SDL_internal.h"
 
@@ -102,6 +102,6 @@ void SDL_WAYLAND_UnloadSymbols(void);
 #include "wayland-client-protocol.h"
 #include "wayland-egl.h"
 
-#endif /* !defined _SDL_waylanddyn_h */
+#endif /* SDL_waylanddyn_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/video/wayland/SDL_waylandevents_c.h

@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandevents_h
-#define _SDL_waylandevents_h
+#ifndef SDL_waylandevents_h_
+#define SDL_waylandevents_h_
 
 #include "SDL_waylandvideo.h"
 #include "SDL_waylandwindow.h"
@@ -46,6 +46,6 @@ extern int Wayland_input_unlock_pointer(struct SDL_WaylandInput *input);
 extern void Wayland_display_add_relative_pointer_manager(SDL_VideoData *d, uint32_t id);
 extern void Wayland_display_destroy_relative_pointer_manager(SDL_VideoData *d);
 
-#endif /* _SDL_waylandevents_h */
+#endif /* SDL_waylandevents_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/video/wayland/SDL_waylandopengles.h

@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandopengles_h
-#define _SDL_waylandopengles_h
+#ifndef SDL_waylandopengles_h_
+#define SDL_waylandopengles_h_
 
 #include "../SDL_sysvideo.h"
 #include "../SDL_egl_c.h"
@@ -43,4 +43,6 @@ extern int Wayland_GLES_SwapWindow(_THIS, SDL_Window * window);
 extern int Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
 extern void Wayland_GLES_DeleteContext(_THIS, SDL_GLContext context);
 
-#endif /* _SDL_waylandopengles_h */
+#endif /* SDL_waylandopengles_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/wayland/SDL_waylandtouch.h

@@ -23,8 +23,8 @@
 
 #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
 
-#ifndef _SDL_waylandtouch_h
-#define _SDL_waylandtouch_h
+#ifndef SDL_waylandtouch_h_
+#define SDL_waylandtouch_h_
 
 #include "SDL_waylandvideo.h"
 #include <stdint.h>
@@ -347,6 +347,6 @@ qt_windowmanager_open_url(struct qt_windowmanager *qt_windowmanager, uint32_t re
              QT_WINDOWMANAGER_OPEN_URL, remaining, url);
 }
 
-#endif /* _SDL_waylandtouch_h */
+#endif /* SDL_waylandtouch_h_ */
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */

src/video/wayland/SDL_waylandvideo.h

@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandvideo_h
-#define _SDL_waylandvideo_h
+#ifndef SDL_waylandvideo_h_
+#define SDL_waylandvideo_h_
 
 #include <EGL/egl.h>
 #include "wayland-util.h"
@@ -66,6 +66,6 @@ typedef struct {
     int relative_mouse_mode;
 } SDL_VideoData;
 
-#endif /* _SDL_waylandvideo_h */
+#endif /* SDL_waylandvideo_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/video/wayland/SDL_waylandvulkan.h

@@ -26,8 +26,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandvulkan_h
-#define _SDL_waylandvulkan_h
+#ifndef SDL_waylandvulkan_h_
+#define SDL_waylandvulkan_h_
 
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -47,6 +47,6 @@ SDL_bool Wayland_Vulkan_CreateSurface(_THIS,
 
 #endif
 
-#endif /* _SDL_waylandvulkan_h */
+#endif /* SDL_waylandvulkan_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/video/wayland/SDL_waylandwindow.h

@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandwindow_h
-#define _SDL_waylandwindow_h
+#ifndef SDL_waylandwindow_h_
+#define SDL_waylandwindow_h_
 
 #include "../SDL_sysvideo.h"
 #include "SDL_syswm.h"
@@ -61,6 +61,6 @@ extern SDL_bool
 Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info);
 extern int Wayland_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
 
-#endif /* _SDL_waylandwindow_h */
+#endif /* SDL_waylandwindow_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */