lavu: Move preprocessor macros in a separate file

And remove all the circular inclusions of avutil.h while at it.

1 files changed, 4 insertions, 17 deletions

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"
 
 /**
  * @}