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

visualtest/include/SDL_visualtest_action_configparser.h

@@ -5,8 +5,8 @@
  * Header file for the parser for action config files.
  */
 
-#ifndef _SDL_visualtest_action_configparser_h
-#define _SDL_visualtest_action_configparser_h
+#ifndef SDL_visualtest_action_configparser_h_
+#define SDL_visualtest_action_configparser_h_
 
 /** The maximum length of one line in the actions file */
 #define MAX_ACTION_LINE_LENGTH 300
@@ -144,4 +144,6 @@ int SDLVisualTest_ParseActionConfig(char* file, SDLVisualTest_ActionQueue* queue
 }
 #endif
 
-#endif /* _SDL_visualtest_action_configparser_h */
+#endif /* SDL_visualtest_action_configparser_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_exhaustive_variator.h

@@ -8,8 +8,8 @@
 #include "SDL_visualtest_harness_argparser.h"
 #include "SDL_visualtest_variator_common.h"
 
-#ifndef _SDL_visualtest_exhaustive_variator_h
-#define _SDL_visualtest_exhaustive_variator_h
+#ifndef SDL_visualtest_exhaustive_variator_h_
+#define SDL_visualtest_exhaustive_variator_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -59,4 +59,6 @@ void SDLVisualTest_FreeExhaustiveVariator(SDLVisualTest_ExhaustiveVariator* vari
 }
 #endif
 
-#endif /* _SDL_visualtest_exhaustive_variator_h */
+#endif /* SDL_visualtest_exhaustive_variator_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_harness_argparser.h

@@ -9,8 +9,8 @@
 #include "SDL_visualtest_variator_common.h"
 #include "SDL_visualtest_action_configparser.h"
 
-#ifndef _SDL_visualtest_harness_argparser_h
-#define _SDL_visualtest_harness_argparser_h
+#ifndef SDL_visualtest_harness_argparser_h_
+#define SDL_visualtest_harness_argparser_h_
 
 /** Maximum length of a path string */
 #define MAX_PATH_LEN 300
@@ -70,4 +70,6 @@ void SDLVisualTest_FreeHarnessState(SDLVisualTest_HarnessState* state);
 }
 #endif
 
-#endif /* _SDL_visualtest_harness_argparser_h */
+#endif /* SDL_visualtest_harness_argparser_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_mischelper.h

@@ -4,8 +4,8 @@
  * Header with miscellaneous helper functions.
  */
 
-#ifndef _SDL_visualtest_mischelper_h
-#define _SDL_visualtest_mischelper_h
+#ifndef SDL_visualtest_mischelper_h_
+#define SDL_visualtest_mischelper_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -23,4 +23,6 @@ void SDLVisualTest_HashString(char* str, char hash[33]);
 }
 #endif
 
-#endif /* _SDL_visualtest_mischelper_h */
+#endif /* SDL_visualtest_mischelper_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_parsehelper.h

@@ -5,8 +5,8 @@
  * Header with some helper functions for parsing strings.
  */
 
-#ifndef _SDL_visualtest_parsehelper_h
-#define _SDL_visualtest_parsehelper_h
+#ifndef SDL_visualtest_parsehelper_h_
+#define SDL_visualtest_parsehelper_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -41,4 +41,6 @@ char** SDLVisualTest_Tokenize(char* str, int max_token_len);
 }
 #endif
 
-#endif /* _SDL_visualtest_parsehelper_h */
+#endif /* SDL_visualtest_parsehelper_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_process.h

@@ -16,8 +16,8 @@
 #error "Unsupported platform."
 #endif
 
-#ifndef _SDL_visualtest_process_h
-#define _SDL_visualtest_process_h
+#ifndef SDL_visualtest_process_h_
+#define SDL_visualtest_process_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -107,5 +107,6 @@ int SDL_GetProcessExitStatus(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps);
 }
 #endif
 
-#endif /* _SDL_visualtest_process_h */
+#endif /* SDL_visualtest_process_h_ */
 
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_random_variator.h

@@ -8,8 +8,8 @@
 #include "SDL_visualtest_harness_argparser.h"
 #include "SDL_visualtest_variator_common.h"
 
-#ifndef _SDL_visualtest_random_variator_h
-#define _SDL_visualtest_random_variator_h
+#ifndef SDL_visualtest_random_variator_h_
+#define SDL_visualtest_random_variator_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -56,4 +56,6 @@ void SDLVisualTest_FreeRandomVariator(SDLVisualTest_RandomVariator* variator);
 }
 #endif
 
-#endif /* _SDL_visualtest_random_variator_h */
+#endif /* SDL_visualtest_random_variator_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_rwhelper.h

@@ -7,8 +7,8 @@
 
 #include <SDL_rwops.h>
 
-#ifndef _SDL_visualtest_rwhelper_h
-#define _SDL_visualtest_rwhelper_h
+#ifndef SDL_visualtest_rwhelper_h_
+#define SDL_visualtest_rwhelper_h_
 
 /** Length of the buffer in SDLVisualTest_RWHelperBuffer */
 #define RWOPS_BUFFER_LEN 256
@@ -82,4 +82,6 @@ int SDLVisualTest_RWHelperCountNonEmptyLines(SDL_RWops* rw,
 }
 #endif
 
-#endif /* _SDL_visualtest_rwhelper_h */
+#endif /* SDL_visualtest_rwhelper_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_screenshot.h

@@ -7,8 +7,8 @@
 
 #include "SDL_visualtest_process.h"
 
-#ifndef _SDL_visualtest_screenshot_h
-#define _SDL_visualtest_screenshot_h
+#ifndef SDL_visualtest_screenshot_h_
+#define SDL_visualtest_screenshot_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -47,4 +47,6 @@ int SDLVisualTest_VerifyScreenshots(char* args, char* test_dir, char* verify_dir
 }
 #endif
 
-#endif /* _SDL_visualtest_screenshot_h */
+#endif /* SDL_visualtest_screenshot_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_sut_configparser.h

@@ -5,8 +5,8 @@
  * Header for the parser for SUT config files.
  */
 
-#ifndef _SDL_visualtest_sut_configparser_h
-#define _SDL_visualtest_sut_configparser_h
+#ifndef SDL_visualtest_sut_configparser_h_
+#define SDL_visualtest_sut_configparser_h_
 
 /** Maximum length of the name of an SUT option */
 #define MAX_SUTOPTION_NAME_LEN 100
@@ -100,4 +100,6 @@ void SDLVisualTest_FreeSUTConfig(SDLVisualTest_SUTConfig* config);
 }
 #endif
 
-#endif /* _SDL_visualtest_sut_configparser_h */
+#endif /* SDL_visualtest_sut_configparser_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_variator_common.h

@@ -8,8 +8,8 @@
 #include <SDL_types.h>
 #include "SDL_visualtest_sut_configparser.h"
 
-#ifndef _SDL_visualtest_variator_common_h
-#define _SDL_visualtest_variator_common_h
+#ifndef SDL_visualtest_variator_common_h_
+#define SDL_visualtest_variator_common_h_
 
 /** The number of variations one integer option would generate */
 #define SDL_SUT_INTEGER_OPTION_TEST_STEPS 3
@@ -117,4 +117,6 @@ int SDLVisualTest_InitVariation(SDLVisualTest_Variation* variation,
 }
 #endif
 
-#endif /* _SDL_visualtest_variator_common_h */
+#endif /* SDL_visualtest_variator_common_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */

visualtest/include/SDL_visualtest_variators.h

@@ -8,8 +8,8 @@
 #include "SDL_visualtest_exhaustive_variator.h"
 #include "SDL_visualtest_random_variator.h"
 
-#ifndef _SDL_visualtest_variators_h
-#define _SDL_visualtest_variators_h
+#ifndef SDL_visualtest_variators_h_
+#define SDL_visualtest_variators_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -61,4 +61,6 @@ void SDLVisualTest_FreeVariator(SDLVisualTest_Variator* variator);
 }
 #endif
 
-#endif /* _SDL_visualtest_variators_h */
+#endif /* SDL_visualtest_variators_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */