diff options
| author | Dmitrij D. Czarkoff <czarkoff@gmail.com> | 2016-01-11 19:03:40 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-01-11 21:05:55 +0100 |
| commit | ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 (patch) | |
| tree | 7eee2d4734a8bc8de35a9e6dd74d75051df64380 /options | |
| parent | 0915a8497b12a7b526e0e8eae322eb8deb31eace (diff) | |
| download | mpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.bz2 mpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.xz | |
mpv_talloc.h: rename from talloc.h
This change helps avoiding conflict with talloc.h from libtalloc.
Diffstat (limited to 'options')
| -rw-r--r-- | options/m_config.c | 2 | ||||
| -rw-r--r-- | options/m_option.c | 2 | ||||
| -rw-r--r-- | options/m_property.c | 2 | ||||
| -rw-r--r-- | options/path.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/options/m_config.c b/options/m_config.c index 0f112dcefb..d58c406ed8 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -30,7 +30,7 @@ #include "libmpv/client.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "m_config.h" #include "options/m_option.h" diff --git a/options/m_option.c b/options/m_option.c index 020bd371ce..9f2d8758d0 100644 --- a/options/m_option.c +++ b/options/m_option.c @@ -36,7 +36,7 @@ #include "libmpv/client.h" #include "player/client.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "common/msg.h" #include "common/msg_control.h" diff --git a/options/m_property.c b/options/m_property.c index 9318d5b7d2..951b788d4b 100644 --- a/options/m_property.c +++ b/options/m_property.c @@ -30,7 +30,7 @@ #include "libmpv/client.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "m_option.h" #include "m_property.h" #include "common/msg.h" diff --git a/options/path.c b/options/path.c index adfd2ded3e..cd1deb6e78 100644 --- a/options/path.c +++ b/options/path.c @@ -39,7 +39,7 @@ #include "common/msg.h" #include "options/options.h" #include "options/path.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "osdep/io.h" #include "osdep/path.h" |