summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/auxiliary/util/p_debug.c4
-rw-r--r--src/gallium/include/pipe/p_debug.h9
2 files changed, 8 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
index 351de95c95..cc036dabf8 100644
--- a/src/gallium/auxiliary/util/p_debug.c
+++ b/src/gallium/auxiliary/util/p_debug.c
@@ -260,7 +260,7 @@ enum {
};
/* Check for aborts enabled. */
-static unsigned abort_en()
+static unsigned abort_en(void)
{
if (!mapped_config_file)
{
@@ -283,7 +283,7 @@ static unsigned abort_en()
return ((((char *)mapped_config_file)[0]) - 0x30) & eAssertAbortEn;
}
#else /* WIN32 */
-static unsigned abort_en()
+static unsigned abort_en(void)
{
return !GETENV("GALLIUM_ABORT_ON_ASSERT");
}
diff --git a/src/gallium/include/pipe/p_debug.h b/src/gallium/include/pipe/p_debug.h
index 95bdf2d3b9..577cdaebcd 100644
--- a/src/gallium/include/pipe/p_debug.h
+++ b/src/gallium/include/pipe/p_debug.h
@@ -63,7 +63,7 @@ extern "C" {
void _debug_vprintf(const char *format, va_list ap);
-static void INLINE
+static INLINE void
_debug_printf(const char *format, ...)
{
va_list ap;
@@ -82,7 +82,7 @@ _debug_printf(const char *format, ...)
* - avoid outputing large strings (512 bytes is the current maximum length
* that is guaranteed to be printed in all platforms)
*/
-static void INLINE
+static INLINE void
debug_printf(const char *format, ...)
{
#ifdef DEBUG
@@ -133,6 +133,9 @@ void _debug_break(void);
#endif /* !DEBUG */
+long
+debug_get_num_option(const char *name, long dfault);
+
void _debug_assert_fail(const char *expr,
const char *file,
unsigned line,
@@ -176,7 +179,7 @@ void _debug_assert_fail(const char *expr,
*/
#ifdef DEBUG
#define debug_checkpoint_full() \
- debug_printf("%s:%u:%s", __FILE__, __LINE__, __FUNCTION__)
+ _debug_printf("%s:%u:%s", __FILE__, __LINE__, __FUNCTION__)
#else
#define debug_checkpoint_full() \
((void)0)