The config sets the default assertion level so people can override it for...

The config sets the default assertion level so people can override it for their own use in application code.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404400

configure.in

@@ -142,19 +142,19 @@ AC_HELP_STRING([--enable-assertions],
 sdl_valid_assertion_level=no
 if test x$enable_assertions = xno; then
     sdl_valid_assertion_level=yes
-    AC_DEFINE(SDL_ASSERT_LEVEL, 0)
+    AC_DEFINE(SDL_DEFAULT_ASSERT_LEVEL, 0)
 fi
 if test x$enable_assertions = xrelease; then
     sdl_valid_assertion_level=yes
-    AC_DEFINE(SDL_ASSERT_LEVEL, 1)
+    AC_DEFINE(SDL_DEFAULT_ASSERT_LEVEL, 1)
 fi
 if test x$enable_assertions = xyes; then
     sdl_valid_assertion_level=yes
-    AC_DEFINE(SDL_ASSERT_LEVEL, 2)
+    AC_DEFINE(SDL_DEFAULT_ASSERT_LEVEL, 2)
 fi
 if test x$enable_assertions = xparanoid; then
     sdl_valid_assertion_level=yes
-    AC_DEFINE(SDL_ASSERT_LEVEL, 3)
+    AC_DEFINE(SDL_DEFAULT_ASSERT_LEVEL, 3)
 fi
 if test x$sdl_valid_assertion_level = xno; then
     AC_MSG_ERROR([*** unknown assertion level. stop.])

include/SDL.h

@@ -77,7 +77,6 @@
 
 #include "SDL_main.h"
 #include "SDL_stdinc.h"
-#include "SDL_assert.h"
 #include "SDL_atomic.h"
 #include "SDL_audio.h"
 #include "SDL_cpuinfo.h"

include/SDL_assert.h

@@ -21,13 +21,11 @@
 */
 #include "SDL_config.h"
 
-/* This is an assert macro for SDL's internal use. Not for the public API! */
-
 #ifndef _SDL_assert_h
 #define _SDL_assert_h
 
 #ifndef SDL_ASSERT_LEVEL
-#error SDL_ASSERT_LEVEL is not defined. Please fix your SDL_config.h.
+#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL
 #endif
 
 /*
@@ -107,12 +105,12 @@ SDL_assert_state SDL_ReportAssertion(SDL_assert_data *, const char *, int);
 #define SDL_enabled_assert(condition) \
     do { \
         while ( !(condition) ) { \
-			static struct SDL_assert_data assert_data = { \
+            static struct SDL_assert_data assert_data = { \
                 0, 0, #condition, __FILE__, 0, 0, 0 \
             }; \
-			const SDL_assert_state state = SDL_ReportAssertion(&assert_data, \
+            const SDL_assert_state state = SDL_ReportAssertion(&assert_data, \
                                                                SDL_FUNCTION, \
-															   __LINE__); \
+                                                               __LINE__); \
             if (state == SDL_ASSERTION_RETRY) { \
                 continue; /* go again. */ \
             } else if (state == SDL_ASSERTION_BREAK) { \
@@ -148,4 +146,3 @@ SDL_assert_state SDL_ReportAssertion(SDL_assert_data *, const char *, int);
 #endif /* _SDL_assert_h */
 
 /* vi: set ts=4 sw=4 expandtab: */
-

include/SDL_config.h.in

@@ -163,7 +163,7 @@
 #endif /* HAVE_LIBC */
 
 /* SDL internal assertion support */
-#undef SDL_ASSERT_LEVEL
+#undef SDL_DEFAULT_ASSERT_LEVEL
 
 /* Allow disabling of core subsystems */
 #undef SDL_AUDIO_DISABLED

include/SDL_config_iphoneos.h

@@ -26,7 +26,7 @@
 #include "SDL_platform.h"
 
 /* SDL internal assertion support */
-#define SDL_ASSERT_LEVEL 1
+#define SDL_DEFAULT_ASSERT_LEVEL 1
 
 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
 typedef signed char int8_t;

include/SDL_config_macosx.h

@@ -29,7 +29,7 @@
 #include <AvailabilityMacros.h>
 
 /* SDL internal assertion support */
-#define SDL_ASSERT_LEVEL 1
+#define SDL_DEFAULT_ASSERT_LEVEL 1
 
 /* This is a set of defines to configure the SDL features */
 

include/SDL_config_minimal.h

@@ -34,7 +34,7 @@
 #include <stdarg.h>
 
 /* SDL internal assertion support */
-#define SDL_ASSERT_LEVEL 1
+#define SDL_DEFAULT_ASSERT_LEVEL 1
 
 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
 typedef signed char int8_t;

include/SDL_config_nintendods.h

@@ -28,7 +28,7 @@
 /* This is a set of defines to configure the SDL features */
 
 /* SDL internal assertion support */
-#define SDL_ASSERT_LEVEL 1
+#define SDL_DEFAULT_ASSERT_LEVEL 1
 
 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
 typedef signed char int8_t;

include/SDL_config_pandora.h

@@ -29,7 +29,7 @@
 #include "SDL_platform.h"
 
 /* SDL internal assertion support */
-#define SDL_ASSERT_LEVEL 1
+#define SDL_DEFAULT_ASSERT_LEVEL 1
 
 #define SDL_HAS_64BIT_TYPE 1
 #define SDL_BYTEORDER 1234

include/SDL_config_win32.h

@@ -28,7 +28,7 @@
 /* This is a set of defines to configure the SDL features */
 
 /* SDL internal assertion support */
-#define SDL_ASSERT_LEVEL 1
+#define SDL_DEFAULT_ASSERT_LEVEL 1
 
 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
 #if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)

include/SDL_config_wiz.h

@@ -29,7 +29,7 @@
 #include "SDL_platform.h"
 
 /* SDL internal assertion support */
-#define SDL_ASSERT_LEVEL 1
+#define SDL_DEFAULT_ASSERT_LEVEL 1
 
 /* Make sure that this isn't included by Visual C++ */
 #ifdef _MSC_VER