Browse code
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
Måns Rullgård authored on 2010/10/01 22:55:13Showing 5 changed files
| 11 | 11 |
deleted file mode 100644 |
| ... | ... |
@@ -1,59 +0,0 @@ |
| 1 |
-/* |
|
| 2 |
- * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at> |
|
| 3 |
- * |
|
| 4 |
- * This file is part of FFmpeg. |
|
| 5 |
- * |
|
| 6 |
- * FFmpeg is free software; you can redistribute it and/or |
|
| 7 |
- * modify it under the terms of the GNU Lesser General Public |
|
| 8 |
- * License as published by the Free Software Foundation; either |
|
| 9 |
- * version 2.1 of the License, or (at your option) any later version. |
|
| 10 |
- * |
|
| 11 |
- * FFmpeg is distributed in the hope that it will be useful, |
|
| 12 |
- * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 |
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
| 14 |
- * Lesser General Public License for more details. |
|
| 15 |
- * |
|
| 16 |
- * You should have received a copy of the GNU Lesser General Public |
|
| 17 |
- * License along with FFmpeg; if not, write to the Free Software |
|
| 18 |
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
| 19 |
- */ |
|
| 20 |
- |
|
| 21 |
-/** |
|
| 22 |
- * @file |
|
| 23 |
- * simple assert() macros that are a bit more flexible than ISO C assert(). |
|
| 24 |
- * @author Michael Niedermayer <michaelni@gmx.at> |
|
| 25 |
- */ |
|
| 26 |
- |
|
| 27 |
-#ifndef AVUTIL_ASSERT_H |
|
| 28 |
-#define AVUTIL_ASSERT_H |
|
| 29 |
- |
|
| 30 |
-#include "avutil.h" |
|
| 31 |
-#include "log.h" |
|
| 32 |
- |
|
| 33 |
-/** |
|
| 34 |
- * assert() equivalent, that is always enabled. |
|
| 35 |
- */ |
|
| 36 |
-#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)
|
|
| 37 |
- |
|
| 38 |
- |
|
| 39 |
-/** |
|
| 40 |
- * assert() equivalent, that does not lie in speed critical code. |
|
| 41 |
- * These asserts() thus can be enabled without fearing speedloss. |
|
| 42 |
- */ |
|
| 43 |
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0 |
|
| 44 |
-#define av_assert1(cond) av_assert0(cond) |
|
| 45 |
-#else |
|
| 46 |
-#define av_assert1(cond) ((void)0) |
|
| 47 |
-#endif |
|
| 48 |
- |
|
| 49 |
- |
|
| 50 |
-/** |
|
| 51 |
- * assert() equivalent, that does lie in speed critical code. |
|
| 52 |
- */ |
|
| 53 |
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 |
|
| 54 |
-#define av_assert2(cond) av_assert0(cond) |
|
| 55 |
-#else |
|
| 56 |
-#define av_assert2(cond) ((void)0) |
|
| 57 |
-#endif |
|
| 58 |
- |
|
| 59 |
-#endif |
| 60 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,59 @@ |
| 0 |
+/* |
|
| 1 |
+ * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at> |
|
| 2 |
+ * |
|
| 3 |
+ * This file is part of FFmpeg. |
|
| 4 |
+ * |
|
| 5 |
+ * FFmpeg is free software; you can redistribute it and/or |
|
| 6 |
+ * modify it under the terms of the GNU Lesser General Public |
|
| 7 |
+ * License as published by the Free Software Foundation; either |
|
| 8 |
+ * version 2.1 of the License, or (at your option) any later version. |
|
| 9 |
+ * |
|
| 10 |
+ * FFmpeg is distributed in the hope that it will be useful, |
|
| 11 |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 12 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
| 13 |
+ * Lesser General Public License for more details. |
|
| 14 |
+ * |
|
| 15 |
+ * You should have received a copy of the GNU Lesser General Public |
|
| 16 |
+ * License along with FFmpeg; if not, write to the Free Software |
|
| 17 |
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
| 18 |
+ */ |
|
| 19 |
+ |
|
| 20 |
+/** |
|
| 21 |
+ * @file |
|
| 22 |
+ * simple assert() macros that are a bit more flexible than ISO C assert(). |
|
| 23 |
+ * @author Michael Niedermayer <michaelni@gmx.at> |
|
| 24 |
+ */ |
|
| 25 |
+ |
|
| 26 |
+#ifndef AVUTIL_AVASSERT_H |
|
| 27 |
+#define AVUTIL_AVASSERT_H |
|
| 28 |
+ |
|
| 29 |
+#include "avutil.h" |
|
| 30 |
+#include "log.h" |
|
| 31 |
+ |
|
| 32 |
+/** |
|
| 33 |
+ * assert() equivalent, that is always enabled. |
|
| 34 |
+ */ |
|
| 35 |
+#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)
|
|
| 36 |
+ |
|
| 37 |
+ |
|
| 38 |
+/** |
|
| 39 |
+ * assert() equivalent, that does not lie in speed critical code. |
|
| 40 |
+ * These asserts() thus can be enabled without fearing speedloss. |
|
| 41 |
+ */ |
|
| 42 |
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0 |
|
| 43 |
+#define av_assert1(cond) av_assert0(cond) |
|
| 44 |
+#else |
|
| 45 |
+#define av_assert1(cond) ((void)0) |
|
| 46 |
+#endif |
|
| 47 |
+ |
|
| 48 |
+ |
|
| 49 |
+/** |
|
| 50 |
+ * assert() equivalent, that does lie in speed critical code. |
|
| 51 |
+ */ |
|
| 52 |
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 |
|
| 53 |
+#define av_assert2(cond) av_assert0(cond) |
|
| 54 |
+#else |
|
| 55 |
+#define av_assert2(cond) ((void)0) |
|
| 56 |
+#endif |
|
| 57 |
+ |
|
| 58 |
+#endif |