From b64b4134d565e22fcdd50132456d8289690aaec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Fri, 1 Oct 2010 13:55:13 +0000
Subject: [PATCH] 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
---
ffmpeg.c | 2 +-
libavutil/Makefile | 2 +-
libavutil/{assert.h => avassert.h} | 4 ++--
libavutil/rational.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
rename libavutil/{assert.h => avassert.h} (97%)
diff --git a/ffmpeg.c b/ffmpeg.c
index b9ae4cae0c1..88ef7985a3a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -79,7 +79,7 @@
#include "cmdutils.h"
-#include "libavutil/assert.h"
+#include "libavutil/avassert.h"
const char program_name[] = "FFmpeg";
const int program_birth_year = 2000;
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 3f13092c3c8..b0d0de88a79 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
similarity index 97%
rename from libavutil/assert.h
rename to libavutil/avassert.h
index cf76912564c..fe307fa8945 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 4e3c50be810..0e0571e136d 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>
--
GitLab