Skip to content
Permalink
Browse files

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

  • Loading branch information
slouken committed Aug 28, 2017
1 parent ce2b164 commit 0d011ec66dc240a75eca4579fd5930c47f4c2355
Showing with 421 additions and 382 deletions.
  1. +3 −3 src/audio/android/SDL_androidaudio.h
  2. +3 −3 src/audio/arts/SDL_artsaudio.h
  3. +4 −3 src/audio/coreaudio/SDL_coreaudio.h
  4. +3 −3 src/audio/directsound/SDL_directsound.h
  5. +4 −3 src/audio/emscripten/SDL_emscriptenaudio.h
  6. +4 −3 src/audio/esd/SDL_esdaudio.h
  7. +4 −3 src/audio/fusionsound/SDL_fsaudio.h
  8. +3 −3 src/audio/haiku/SDL_haikuaudio.h
  9. +3 −3 src/audio/jack/SDL_jackaudio.h
  10. +5 −3 src/audio/nacl/SDL_naclaudio.h
  11. +3 −3 src/audio/netbsd/SDL_netbsdaudio.h
  12. +3 −3 src/audio/paudio/SDL_paudio.h
  13. +5 −5 src/audio/psp/SDL_pspaudio.h
  14. +3 −3 src/audio/sndio/SDL_sndioaudio.h
  15. +3 −3 src/audio/sun/SDL_sunaudio.h
  16. +3 −3 src/audio/winmm/SDL_winmm.h
  17. +3 −3 src/audio/xaudio2/SDL_xaudio2.h
  18. +3 −3 src/core/windows/SDL_directx.h
  19. +3 −3 src/core/windows/SDL_xinput.h
  20. +3 −3 src/core/winrt/SDL_winrtapp_common.h
  21. +3 −3 src/core/winrt/SDL_winrtapp_xaml.h
  22. +3 −3 src/haptic/windows/SDL_windowshaptic_c.h
  23. +3 −3 src/joystick/android/SDL_sysjoystick_c.h
  24. +3 −3 src/thread/windows/SDL_systhread_c.h
  25. +3 −3 src/video/android/SDL_androidclipboard.h
  26. +3 −3 src/video/android/SDL_androidgl.h
  27. +3 −3 src/video/android/SDL_androidmouse.h
  28. +3 −3 src/video/android/SDL_androidvideo.h
  29. +3 −3 src/video/android/SDL_androidvulkan.h
  30. +3 −3 src/video/android/SDL_androidwindow.h
  31. +3 −3 src/video/cocoa/SDL_cocoaclipboard.h
  32. +3 −3 src/video/cocoa/SDL_cocoaevents.h
  33. +3 −3 src/video/cocoa/SDL_cocoakeyboard.h
  34. +3 −3 src/video/cocoa/SDL_cocoametalview.h
  35. +3 −3 src/video/cocoa/SDL_cocoamodes.h
  36. +3 −3 src/video/cocoa/SDL_cocoamouse.h
  37. +3 −3 src/video/cocoa/SDL_cocoamousetap.h
  38. +3 −3 src/video/cocoa/SDL_cocoaopengl.h
  39. +5 −3 src/video/cocoa/SDL_cocoashape.h
  40. +3 −3 src/video/cocoa/SDL_cocoavideo.h
  41. +3 −3 src/video/cocoa/SDL_cocoavulkan.h
  42. +3 −3 src/video/cocoa/SDL_cocoawindow.h
  43. +3 −3 src/video/directfb/SDL_DirectFB_WM.h
  44. +5 −3 src/video/directfb/SDL_DirectFB_dyn.h
  45. +5 −3 src/video/directfb/SDL_DirectFB_events.h
  46. +3 −3 src/video/directfb/SDL_DirectFB_modes.h
  47. +3 −3 src/video/directfb/SDL_DirectFB_mouse.h
  48. +3 −3 src/video/directfb/SDL_DirectFB_opengl.h
  49. +3 −3 src/video/directfb/SDL_DirectFB_shape.h
  50. +3 −3 src/video/directfb/SDL_DirectFB_video.h
  51. +3 −3 src/video/directfb/SDL_DirectFB_window.h
  52. +3 −3 src/video/emscripten/SDL_emscriptenevents.h
  53. +3 −3 src/video/emscripten/SDL_emscriptenframebuffer.h
  54. +3 −3 src/video/emscripten/SDL_emscriptenmouse.h
  55. +3 −3 src/video/emscripten/SDL_emscriptenopengles.h
  56. +3 −3 src/video/emscripten/SDL_emscriptenvideo.h
  57. +3 −3 src/video/haiku/SDL_BWin.h
  58. +3 −3 src/video/kmsdrm/SDL_kmsdrmdyn.h
  59. +3 −3 src/video/kmsdrm/SDL_kmsdrmevents.h
  60. +3 −3 src/video/kmsdrm/SDL_kmsdrmmouse.h
  61. +3 −3 src/video/kmsdrm/SDL_kmsdrmopengles.h
  62. +3 −3 src/video/mir/SDL_mirdyn.h
  63. +3 −3 src/video/mir/SDL_mirevents.h
  64. +3 −3 src/video/mir/SDL_mirframebuffer.h
  65. +3 −3 src/video/mir/SDL_mirmouse.h
  66. +3 −3 src/video/mir/SDL_miropengl.h
  67. +3 −3 src/video/mir/SDL_mirvideo.h
  68. +3 −3 src/video/mir/SDL_mirvulkan.h
  69. +3 −3 src/video/mir/SDL_mirwindow.h
  70. +3 −3 src/video/nacl/SDL_naclevents_c.h
  71. +3 −3 src/video/nacl/SDL_naclopengles.h
  72. +3 −3 src/video/nacl/SDL_naclvideo.h
  73. +3 −3 src/video/nacl/SDL_naclwindow.h
  74. +5 −3 src/video/psp/SDL_pspgl_c.h
  75. +3 −3 src/video/psp/SDL_pspvideo.h
  76. +3 −3 src/video/raspberry/SDL_rpievents_c.h
  77. +3 −3 src/video/raspberry/SDL_rpimouse.h
  78. +3 −3 src/video/raspberry/SDL_rpiopengles.h
  79. +3 −3 src/video/uikit/SDL_uikitclipboard.h
  80. +3 −3 src/video/uikit/SDL_uikitevents.h
  81. +5 −3 src/video/uikit/SDL_uikitmetalview.h
  82. +3 −3 src/video/uikit/SDL_uikitmodes.h
  83. +3 −3 src/video/uikit/SDL_uikitopengles.h
  84. +3 −3 src/video/uikit/SDL_uikitvideo.h
  85. +3 −3 src/video/uikit/SDL_uikitvulkan.h
  86. +3 −3 src/video/uikit/SDL_uikitwindow.h
  87. +3 −3 src/video/vivante/SDL_vivanteopengles.h
  88. +3 −3 src/video/vivante/SDL_vivanteplatform.h
  89. +3 −3 src/video/vivante/SDL_vivantevideo.h
  90. +3 −3 src/video/wayland/SDL_waylandclipboard.h
  91. +3 −5 src/video/wayland/SDL_waylanddatamanager.h
  92. +3 −3 src/video/wayland/SDL_waylanddyn.h
  93. +3 −3 src/video/wayland/SDL_waylandevents_c.h
  94. +5 −3 src/video/wayland/SDL_waylandopengles.h
  95. +3 −3 src/video/wayland/SDL_waylandtouch.h
  96. +3 −3 src/video/wayland/SDL_waylandvideo.h
  97. +3 −3 src/video/wayland/SDL_waylandvulkan.h
  98. +3 −3 src/video/wayland/SDL_waylandwindow.h
  99. +3 −3 src/video/windows/SDL_msctf.h
  100. +3 −3 src/video/windows/SDL_windowsclipboard.h
  101. +3 −3 src/video/windows/SDL_windowsevents.h
  102. +3 −3 src/video/windows/SDL_windowskeyboard.h
  103. +3 −3 src/video/windows/SDL_windowsmodes.h
  104. +3 −3 src/video/windows/SDL_windowsmouse.h
  105. +3 −3 src/video/windows/SDL_windowsopengl.h
  106. +3 −3 src/video/windows/SDL_windowsopengles.h
  107. +3 −3 src/video/windows/SDL_windowsshape.h
  108. +3 −3 src/video/windows/SDL_windowsvideo.h
  109. +3 −3 src/video/windows/SDL_windowsvulkan.h
  110. +3 −3 src/video/windows/SDL_windowswindow.h
  111. +3 −3 src/video/winrt/SDL_winrtgamebar_cpp.h
  112. +3 −3 src/video/winrt/SDL_winrtmouse_c.h
  113. +3 −3 src/video/winrt/SDL_winrtopengles.h
  114. +3 −3 src/video/x11/SDL_x11vulkan.h
  115. +5 −3 visualtest/include/SDL_visualtest_action_configparser.h
  116. +5 −3 visualtest/include/SDL_visualtest_exhaustive_variator.h
  117. +5 −3 visualtest/include/SDL_visualtest_harness_argparser.h
  118. +5 −3 visualtest/include/SDL_visualtest_mischelper.h
  119. +5 −3 visualtest/include/SDL_visualtest_parsehelper.h
  120. +4 −3 visualtest/include/SDL_visualtest_process.h
  121. +5 −3 visualtest/include/SDL_visualtest_random_variator.h
  122. +5 −3 visualtest/include/SDL_visualtest_rwhelper.h
  123. +5 −3 visualtest/include/SDL_visualtest_screenshot.h
  124. +5 −3 visualtest/include/SDL_visualtest_sut_configparser.h
  125. +5 −3 visualtest/include/SDL_visualtest_variator_common.h
  126. +5 −3 visualtest/include/SDL_visualtest_variators.h
@@ -20,8 +20,8 @@
*/
#include "../../SDL_internal.h"

#ifndef _SDL_androidaudio_h
#define _SDL_androidaudio_h
#ifndef SDL_androidaudio_h_
#define SDL_androidaudio_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_androidaudio_h */
#endif /* SDL_androidaudio_h_ */

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

#ifndef _SDL_artsaudio_h
#define _SDL_artsaudio_h
#ifndef SDL_artsaudio_h_
#define SDL_artsaudio_h_

#include <artsc.h>

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

#endif /* _SDL_artsaudio_h */
#endif /* SDL_artsaudio_h_ */

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

#ifndef _SDL_coreaudio_h
#define _SDL_coreaudio_h
#ifndef SDL_coreaudio_h_
#define SDL_coreaudio_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_coreaudio_h */
#endif /* SDL_coreaudio_h_ */

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

#ifndef _SDL_directsound_h
#define _SDL_directsound_h
#ifndef SDL_directsound_h_
#define SDL_directsound_h_

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

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

#endif /* _SDL_directsound_h */
#endif /* SDL_directsound_h_ */

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

#ifndef _SDL_emscriptenaudio_h
#define _SDL_emscriptenaudio_h
#ifndef SDL_emscriptenaudio_h_
#define SDL_emscriptenaudio_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_emscriptenaudio_h */
#endif /* SDL_emscriptenaudio_h_ */

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

#ifndef _SDL_esdaudio_h
#define _SDL_esdaudio_h
#ifndef SDL_esdaudio_h_
#define SDL_esdaudio_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_esdaudio_h */
#endif /* SDL_esdaudio_h_ */

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

#ifndef _SDL_fsaudio_h
#define _SDL_fsaudio_h
#ifndef SDL_fsaudio_h_
#define SDL_fsaudio_h_

#include <fusionsound/fusionsound.h>

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

};

#endif /* _SDL_fsaudio_h */
#endif /* SDL_fsaudio_h_ */

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

#ifndef _SDL_haikuaudio_h
#define _SDL_haikuaudio_h
#ifndef SDL_haikuaudio_h_
#define SDL_haikuaudio_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_haikuaudio_h */
#endif /* SDL_haikuaudio_h_ */

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

#include <jack/jack.h>

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

#endif /* _SDL_jackaudio_h */
#endif /* SDL_jackaudio_h_ */

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

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

#ifndef _SDL_naclaudio_h
#define _SDL_naclaudio_h
#ifndef SDL_naclaudio_h_
#define SDL_naclaudio_h_

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

#endif /* _SDL_naclaudio_h */
#endif /* SDL_naclaudio_h_ */

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

#ifndef _SDL_netbsdaudio_h
#define _SDL_netbsdaudio_h
#ifndef SDL_netbsdaudio_h_
#define SDL_netbsdaudio_h_

#include "../SDL_sysaudio.h"

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

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

#endif /* _SDL_netbsdaudio_h */
#endif /* SDL_netbsdaudio_h_ */

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

#ifndef _SDL_paudio_h
#define _SDL_paudio_h
#ifndef SDL_paudio_h_
#define SDL_paudio_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_paudio_h */
#endif /* SDL_paudio_h_ */

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

#ifndef _SDL_pspaudio_h
#define _SDL_pspaudio_h
#ifndef SDL_pspaudio_h_
#define SDL_pspaudio_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_pspaudio_h */
/* vim: ts=4 sw=4
*/
#endif /* SDL_pspaudio_h_ */

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

#ifndef _SDL_sndioaudio_h
#define _SDL_sndioaudio_h
#ifndef SDL_sndioaudio_h_
#define SDL_sndioaudio_h_

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

#endif /* _SDL_sndioaudio_h */
#endif /* SDL_sndioaudio_h_ */

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

#ifndef _SDL_sunaudio_h
#define _SDL_sunaudio_h
#ifndef SDL_sunaudio_h_
#define SDL_sunaudio_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_sunaudio_h */
#endif /* SDL_sunaudio_h_ */

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

#ifndef _SDL_winmm_h
#define _SDL_winmm_h
#ifndef SDL_winmm_h_
#define SDL_winmm_h_

#include "../SDL_sysaudio.h"

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

#endif /* _SDL_winmm_h */
#endif /* SDL_winmm_h_ */

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

#ifndef _SDL_XAUDIO2_H
#define _SDL_XAUDIO2_H
#ifndef SDL_XAUDIO2_H_
#define SDL_XAUDIO2_H_

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

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

#endif /* _SDL_XAUDIO2_H */
#endif /* SDL_XAUDIO2_H_ */

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

#ifndef _SDL_directx_h
#define _SDL_directx_h
#ifndef SDL_directx_h_
#define SDL_directx_h_

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

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

#endif /* _SDL_directx_h */
#endif /* SDL_directx_h_ */

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

#ifndef _SDL_xinput_h
#define _SDL_xinput_h
#ifndef SDL_xinput_h_
#define SDL_xinput_h_

#ifdef HAVE_XINPUT_H

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

#endif /* HAVE_XINPUT_H */

#endif /* _SDL_xinput_h */
#endif /* SDL_xinput_h_ */

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

#ifndef _SDL_winrtapp_common_h
#define _SDL_winrtapp_common_h
#ifndef SDL_winrtapp_common_h_
#define SDL_winrtapp_common_h_

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

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

#ifndef _SDL_winrtapp_xaml_h
#define _SDL_winrtapp_xaml_h
#ifndef SDL_winrtapp_xaml_h_
#define SDL_winrtapp_xaml_h_

#include "SDL_stdinc.h"

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

#endif // ifndef _SDL_winrtapp_xaml_h
#endif // SDL_winrtapp_xaml_h_

0 comments on commit 0d011ec

Please sign in to comment.