Commit 9a4c10e3 authored by Luca Barbato's avatar Luca Barbato

lavu: Move preprocessor macros in a separate file

And remove all the circular inclusions of avutil.h while at it.
parent 4d2bb289
...@@ -27,6 +27,7 @@ HEADERS = adler32.h \ ...@@ -27,6 +27,7 @@ HEADERS = adler32.h \
intreadwrite.h \ intreadwrite.h \
lfg.h \ lfg.h \
log.h \ log.h \
macros.h \
mathematics.h \ mathematics.h \
md5.h \ md5.h \
mem.h \ mem.h \
......
...@@ -144,29 +144,15 @@ ...@@ -144,29 +144,15 @@
* @{ * @{
* *
* @} * @}
*/
/**
* @defgroup preproc_misc Preprocessor String Macros
* *
* String manipulation macros * @defgroup preproc_misc Preprocessor String Macros
* *
* @{ * @{
*/ *
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
#define AV_GLUE(a, b) a ## b
#define AV_JOIN(a, b) AV_GLUE(a, b)
#define AV_PRAGMA(s) _Pragma(#s)
/**
* @} * @}
*/ */
/** /**
* @addtogroup lavu_ver * @addtogroup lavu_ver
* @{ * @{
...@@ -288,6 +274,7 @@ char av_get_picture_type_char(enum AVPictureType pict_type); ...@@ -288,6 +274,7 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
#include "error.h" #include "error.h"
#include "version.h" #include "version.h"
#include "macros.h"
/** /**
* @} * @}
......
/*
* This file is part of Libav.
*
* Libav 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.
*
* Libav 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 Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
* @ingroup lavu
* Utility Preprocessor macros
*/
#ifndef AVUTIL_MACROS_H
#define AVUTIL_MACROS_H
/**
* @addtogroup preproc_misc Preprocessor String Macros
*
* String manipulation macros
*
* @{
*/
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
#define AV_GLUE(a, b) a ## b
#define AV_JOIN(a, b) AV_GLUE(a, b)
/**
* @}
*/
#define AV_PRAGMA(s) _Pragma(#s)
#endif /* AVUTIL_MACROS_H */
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
*/ */
#include "config.h" #include "config.h"
#include "version.h" #include "avutil.h"
/** /**
* @file * @file
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef AVUTIL_VERSION_H #ifndef AVUTIL_VERSION_H
#define AVUTIL_VERSION_H #define AVUTIL_VERSION_H
#include "avutil.h" #include "macros.h"
/** /**
* @defgroup version_utils Library Version Macros * @defgroup version_utils Library Version Macros
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment