From 9a4c10e3af011dd84d3135090d3ca4212cbad127 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Fri, 27 Dec 2013 02:57:48 +0100
Subject: lavu: Move preprocessor macros in a separate file

And remove all the circular inclusions of avutil.h while at it.
---
 libavutil/Makefile  |  1 +
 libavutil/avutil.h  | 21 ++++-----------------
 libavutil/macros.h  | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 libavutil/utils.c   |  2 +-
 libavutil/version.h |  2 +-
 5 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 libavutil/macros.h

diff --git a/libavutil/Makefile b/libavutil/Makefile
index cfe8d84ebe..e0e32b4fba 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -27,6 +27,7 @@ HEADERS = adler32.h                                                     \
           intreadwrite.h                                                \
           lfg.h                                                         \
           log.h                                                         \
+          macros.h                                                      \
           mathematics.h                                                 \
           md5.h                                                         \
           mem.h                                                         \
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 928a0146a1..a0d35d1627 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -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
  * @{
@@ -288,6 +274,7 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
 
 #include "error.h"
 #include "version.h"
+#include "macros.h"
 
 /**
  * @}
diff --git a/libavutil/macros.h b/libavutil/macros.h
new file mode 100644
index 0000000000..bf3eb9b9a4
--- /dev/null
+++ b/libavutil/macros.h
@@ -0,0 +1,48 @@
+/*
+ * 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 */
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 2bb27de2b1..9b18c97908 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "version.h"
+#include "avutil.h"
 
 /**
  * @file
diff --git a/libavutil/version.h b/libavutil/version.h
index cf5cc2fb14..ed7d13ac5a 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -19,7 +19,7 @@
 #ifndef AVUTIL_VERSION_H
 #define AVUTIL_VERSION_H
 
-#include "avutil.h"
+#include "macros.h"
 
 /**
  * @defgroup version_utils Library Version Macros
-- 
cgit v1.2.3