Merge pull request #64933 from madmiraal/fix-error_macros-header-guard-3.x
[3.x] Fix header guard in error_macros.h
This commit is contained in:
commit
5beec641b6
1 changed files with 1 additions and 2 deletions
|
@ -518,8 +518,6 @@ void _err_flush_stdout();
|
||||||
} else \
|
} else \
|
||||||
((void)0)
|
((void)0)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This should be a 'free' assert for program flow and should not be needed in any releases,
|
* This should be a 'free' assert for program flow and should not be needed in any releases,
|
||||||
* only used in dev builds.
|
* only used in dev builds.
|
||||||
|
@ -558,5 +556,6 @@ void _err_flush_stdout();
|
||||||
((void)0)
|
((void)0)
|
||||||
#else
|
#else
|
||||||
#define DEV_CHECK_ONCE(m_cond)
|
#define DEV_CHECK_ONCE(m_cond)
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // ERROR_MACROS_H
|
#endif // ERROR_MACROS_H
|
||||||
|
|
Loading…
Reference in a new issue