diff options
| author | Måns Rullgård | 2010-10-01 13:55:13 +0000 |
|---|---|---|
| committer | Måns Rullgård | 2010-10-01 13:55:13 +0000 |
| commit | b64b4134d565e22fcdd50132456d8289690aaec8 (patch) | |
| tree | bf83ac640a4aa993c42c7aa2db04cbf3582fad05 /libavutil | |
| parent | 8a47d90b2918c74a26bd313e8e70452bdc969a02 (diff) | |
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
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/avassert.h (renamed from libavutil/assert.h) | 4 | ||||
| -rw-r--r-- | libavutil/rational.c | 2 |
3 files changed, 4 insertions, 4 deletions
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/avassert.h index cf76912564..fe307fa894 100644 --- a/libavutil/assert.h +++ b/libavutil/avassert.h @@ -24,8 +24,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef AVUTIL_ASSERT_H -#define AVUTIL_ASSERT_H +#ifndef AVUTIL_AVASSERT_H +#define AVUTIL_AVASSERT_H #include "avutil.h" #include "log.h" 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 <michaelni@gmx.at> */ -#include "assert.h" +#include "avassert.h" //#include <math.h> #include <limits.h> |