Update SDL2 headers... oops

1 files changed, 30 insertions, 33 deletions

diff --git a/src/SDL2/include/SDL_test_harness.h b/src/SDL2/include/SDL_test_harness.h
index 1c596790..d2da04f1 100644
--- a/src/SDL2/include/SDL_test_harness.h
+++ b/src/SDL2/include/SDL_test_harness.h
@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -21,7 +21,7 @@
 
 /**
  *  \file SDL_test_harness.h
- *  
+ *
  *  Include file for SDL test framework.
  *
  *  This code is a part of the SDL2_test library, not the main SDL library.
@@ -29,7 +29,7 @@
 
 /*
   Defines types for test case definitions and the test execution harness API.
-  
+
   Based on original GSOC code by Markus Kauppila <markus.kauppila@gmail.com>
 */
 
@@ -39,9 +39,7 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
-/* *INDENT-OFF* */
 extern "C" {
-/* *INDENT-ON* */
 #endif
 
 
@@ -50,22 +48,23 @@ extern "C" {
 #define TEST_DISABLED 0
 
 //! Definition of all the possible test return values of the test case method
-#define TEST_ABORTED		-1
-#define TEST_COMPLETED		 0
-#define TEST_SKIPPED		 1
+#define TEST_ABORTED        -1
+#define TEST_STARTED         0
+#define TEST_COMPLETED       1
+#define TEST_SKIPPED         2
 
 //! Definition of all the possible test results for the harness
-#define TEST_RESULT_PASSED				0
-#define TEST_RESULT_FAILED				1
-#define TEST_RESULT_NO_ASSERT			2
-#define TEST_RESULT_SKIPPED				3
-#define TEST_RESULT_SETUP_FAILURE		4
+#define TEST_RESULT_PASSED              0
+#define TEST_RESULT_FAILED              1
+#define TEST_RESULT_NO_ASSERT           2
+#define TEST_RESULT_SKIPPED             3
+#define TEST_RESULT_SETUP_FAILURE       4
 
 //!< Function pointer to a test case setup function (run before every test)
 typedef void (*SDLTest_TestCaseSetUpFp)(void *arg);
 
 //!< Function pointer to a test case function
-typedef void (*SDLTest_TestCaseFp)(void *arg);
+typedef int (*SDLTest_TestCaseFp)(void *arg);
 
 //!< Function pointer to a test case teardown function (run after every test)
 typedef void  (*SDLTest_TestCaseTearDownFp)(void *arg);
@@ -74,28 +73,28 @@ typedef void  (*SDLTest_TestCaseTearDownFp)(void *arg);
  * Holds information about a single test case.
  */
 typedef struct SDLTest_TestCaseReference {
-	/*!< Func2Stress */
-	SDLTest_TestCaseFp testCase;
-	/*!< Short name (or function name) "Func2Stress" */
-	char *name;
-	/*!< Long name or full description "This test pushes func2() to the limit." */
-	char *description;
-	/*!< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
-	int enabled;
+    /*!< Func2Stress */
+    SDLTest_TestCaseFp testCase;
+    /*!< Short name (or function name) "Func2Stress" */
+    char *name;
+    /*!< Long name or full description "This test pushes func2() to the limit." */
+    char *description;
+    /*!< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
+    int enabled;
 } SDLTest_TestCaseReference;
 
 /**
  * Holds information about a test suite (multiple test cases).
  */
 typedef struct SDLTest_TestSuiteReference {
-	/*!< "PlatformSuite" */
-	char *name;
-	/*!< The function that is run before each test. NULL skips. */
-	SDLTest_TestCaseSetUpFp testSetUp;
-	/*!< The test cases that are run as part of the suite. Last item should be NULL. */
-	const SDLTest_TestCaseReference **testCases;
-	/*!< The function that is run after each test. NULL skips. */
-	SDLTest_TestCaseTearDownFp testTearDown;
+    /*!< "PlatformSuite" */
+    char *name;
+    /*!< The function that is run before each test. NULL skips. */
+    SDLTest_TestCaseSetUpFp testSetUp;
+    /*!< The test cases that are run as part of the suite. Last item should be NULL. */
+    const SDLTest_TestCaseReference **testCases;
+    /*!< The function that is run after each test. NULL skips. */
+    SDLTest_TestCaseTearDownFp testTearDown;
 } SDLTest_TestSuiteReference;
 
 
@@ -111,13 +110,11 @@ typedef struct SDLTest_TestSuiteReference {
  * \returns Test run result; 0 when all tests passed, 1 if any tests failed.
  */
 int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *userRunSeed, Uint64 userExecKey, const char *filter, int testIterations);
-         
+
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
-/* *INDENT-OFF* */
 }
-/* *INDENT-ON* */
 #endif
 #include "close_code.h"