From b64b4134d565e22fcdd50132456d8289690aaec8 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Fri, 1 Oct 2010 13:55:13 +0000 Subject: Rename libavutil/assert.h to avassert.h This avoids conflicts with the system assert.h. Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/Makefile | 2 +- libavutil/assert.h | 59 ---------------------------------------------------- libavutil/avassert.h | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ libavutil/rational.c | 2 +- 4 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 libavutil/assert.h create mode 100644 libavutil/avassert.h (limited to 'libavutil') diff --git a/libavutil/Makefile b/libavutil/Makefile index 3f13092c3c..b0d0de88a7 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -3,8 +3,8 @@ include $(SUBDIR)../config.mak NAME = avutil HEADERS = adler32.h \ - assert.h \ attributes.h \ + avassert.h \ avstring.h \ avutil.h \ base64.h \ diff --git a/libavutil/assert.h b/libavutil/assert.h deleted file mode 100644 index cf76912564..0000000000 --- a/libavutil/assert.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * copyright (c) 2010 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * simple assert() macros that are a bit more flexible than ISO C assert(). - * @author Michael Niedermayer - */ - -#ifndef AVUTIL_ASSERT_H -#define AVUTIL_ASSERT_H - -#include "avutil.h" -#include "log.h" - -/** - * assert() equivalent, that is always enabled. - */ -#define av_assert0(cond) do {if(!(cond)) { av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n", AV_STRINGIFY(cond), __FILE__, __LINE__); abort(); }}while(0) - - -/** - * assert() equivalent, that does not lie in speed critical code. - * These asserts() thus can be enabled without fearing speedloss. - */ -#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0 -#define av_assert1(cond) av_assert0(cond) -#else -#define av_assert1(cond) ((void)0) -#endif - - -/** - * assert() equivalent, that does lie in speed critical code. - */ -#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 -#define av_assert2(cond) av_assert0(cond) -#else -#define av_assert2(cond) ((void)0) -#endif - -#endif diff --git a/libavutil/avassert.h b/libavutil/avassert.h new file mode 100644 index 0000000000..fe307fa894 --- /dev/null +++ b/libavutil/avassert.h @@ -0,0 +1,59 @@ +/* + * copyright (c) 2010 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * simple assert() macros that are a bit more flexible than ISO C assert(). + * @author Michael Niedermayer + */ + +#ifndef AVUTIL_AVASSERT_H +#define AVUTIL_AVASSERT_H + +#include "avutil.h" +#include "log.h" + +/** + * assert() equivalent, that is always enabled. + */ +#define av_assert0(cond) do {if(!(cond)) { av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n", AV_STRINGIFY(cond), __FILE__, __LINE__); abort(); }}while(0) + + +/** + * assert() equivalent, that does not lie in speed critical code. + * These asserts() thus can be enabled without fearing speedloss. + */ +#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0 +#define av_assert1(cond) av_assert0(cond) +#else +#define av_assert1(cond) ((void)0) +#endif + + +/** + * assert() equivalent, that does lie in speed critical code. + */ +#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 +#define av_assert2(cond) av_assert0(cond) +#else +#define av_assert2(cond) ((void)0) +#endif + +#endif diff --git a/libavutil/rational.c b/libavutil/rational.c index 4e3c50be81..0e0571e136 100644 --- a/libavutil/rational.c +++ b/libavutil/rational.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer */ -#include "assert.h" +#include "avassert.h" //#include #include -- cgit v1.2.3