Commit 63b3e06f75867fa0640021b28cdb71357f747812

Philipp Wiesemann 2017-06-03T23:00:15

Corrected names of header file guards.

diff --git a/src/audio/arts/SDL_artsaudio.h b/src/audio/arts/SDL_artsaudio.h
index 3bd63fa..3fc564b 100644
--- a/src/audio/arts/SDL_artsaudio.h
+++ b/src/audio/arts/SDL_artsaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_artscaudio_h
-#define _SDL_artscaudio_h
+#ifndef _SDL_artsaudio_h
+#define _SDL_artsaudio_h
 
 #include <artsc.h>
 
@@ -48,5 +48,6 @@ struct SDL_PrivateAudioData
 };
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
 
-#endif /* _SDL_artscaudio_h */
+#endif /* _SDL_artsaudio_h */
+
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/haiku/SDL_haikuaudio.h b/src/audio/haiku/SDL_haikuaudio.h
index fa06e21..c704289 100644
--- a/src/audio/haiku/SDL_haikuaudio.h
+++ b/src/audio/haiku/SDL_haikuaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_beaudio_h
-#define _SDL_beaudio_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_beaudio_h */
+#endif /* _SDL_haikuaudio_h */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/netbsd/SDL_netbsdaudio.h b/src/audio/netbsd/SDL_netbsdaudio.h
index d18bb10..7da2780 100644
--- a/src/audio/netbsd/SDL_netbsdaudio.h
+++ b/src/audio/netbsd/SDL_netbsdaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_bsdaudio_h
-#define _SDL_bsdaudio_h
+#ifndef _SDL_netbsdaudio_h
+#define _SDL_netbsdaudio_h
 
 #include "../SDL_sysaudio.h"
 
@@ -46,6 +46,6 @@ struct SDL_PrivateAudioData
 
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
 
-#endif /* _SDL_bsdaudio_h */
+#endif /* _SDL_netbsdaudio_h */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/paudio/SDL_paudio.h b/src/audio/paudio/SDL_paudio.h
index a269dbb..7342da2 100644
--- a/src/audio/paudio/SDL_paudio.h
+++ b/src/audio/paudio/SDL_paudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_paudaudio_h
-#define _SDL_paudaudio_h
+#ifndef _SDL_paudio_h
+#define _SDL_paudio_h
 
 #include "../SDL_sysaudio.h"
 
@@ -43,5 +43,6 @@ struct SDL_PrivateAudioData
 };
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
 
-#endif /* _SDL_paudaudio_h */
+#endif /* _SDL_paudio_h */
+
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengles2/SDL_shaders_gles2.h b/src/render/opengles2/SDL_shaders_gles2.h
index 6fe86d9..f87b7ea 100644
--- a/src/render/opengles2/SDL_shaders_gles2.h
+++ b/src/render/opengles2/SDL_shaders_gles2.h
@@ -22,8 +22,8 @@
 
 #if SDL_VIDEO_RENDER_OGL_ES2
 
-#ifndef SDL_shaderdata_h_
-#define SDL_shaderdata_h_
+#ifndef SDL_shaders_gles2_h_
+#define SDL_shaders_gles2_h_
 
 typedef struct GLES2_ShaderInstance
 {
@@ -56,7 +56,7 @@ typedef enum
 
 const GLES2_Shader *GLES2_GetShader(GLES2_ShaderType type, SDL_BlendMode blendMode);
 
-#endif /* SDL_shaderdata_h_ */
+#endif /* SDL_shaders_gles2_h_ */
 
 #endif /* SDL_VIDEO_RENDER_OGL_ES2 */
 
diff --git a/src/video/nacl/SDL_naclopengles.h b/src/video/nacl/SDL_naclopengles.h
index 96fc38d..8ca1564 100644
--- a/src/video/nacl/SDL_naclopengles.h
+++ b/src/video/nacl/SDL_naclopengles.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_naclgl_h
-#define _SDL_naclgl_h
+#ifndef _SDL_naclopengles_h
+#define _SDL_naclopengles_h
 
 extern int NACL_GLES_LoadLibrary(_THIS, const char *path);
 extern void *NACL_GLES_GetProcAddress(_THIS, const char *proc);
@@ -33,6 +33,6 @@ extern int NACL_GLES_GetSwapInterval(_THIS);
 extern int NACL_GLES_SwapWindow(_THIS, SDL_Window * window);
 extern void NACL_GLES_DeleteContext(_THIS, SDL_GLContext context);
 
-#endif /* _SDL_naclgl_h */
+#endif /* _SDL_naclopengles_h */
 
 /* vi: set ts=4 sw=4 expandtab: */