From fa8c50d4cff38242dfddc5fa968ce7fef06f93ca Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 12 Jan 2005 22:00:02 +0000
Subject: [PATCH] af_format.h needs config.h to be included first.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14480 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libaf/af_format.h  | 4 ++++
 libao2/ao_arts.c   | 2 +-
 libao2/ao_dsound.c | 1 +
 libao2/ao_esd.c    | 2 +-
 libao2/ao_jack.c   | 2 +-
 libao2/ao_macosx.c | 1 +
 libao2/ao_nas.c    | 1 +
 libao2/ao_null.c   | 1 +
 libao2/ao_polyp.c  | 2 +-
 libao2/ao_win32.c  | 1 +
 10 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libaf/af_format.h b/libaf/af_format.h
index 0f55b500a3..ab495dc634 100644
--- a/libaf/af_format.h
+++ b/libaf/af_format.h
@@ -4,6 +4,10 @@
 #ifndef __af_format_h__
 #define __af_format_h__
 
+#ifndef MPLAYER_CONFIG_H
+#error af_format.h needs config.h
+#endif
+
 // Endianess
 #define AF_FORMAT_BE		(0<<0) // Big Endian
 #define AF_FORMAT_LE		(1<<0) // Little Endian
diff --git a/libao2/ao_arts.c b/libao2/ao_arts.c
index ad19b9845b..35e678b9e0 100644
--- a/libao2/ao_arts.c
+++ b/libao2/ao_arts.c
@@ -10,10 +10,10 @@
 #include <artsc.h>
 #include <stdio.h>
 
+#include "config.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
-#include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c
index 3ac34f9df8..7c3ca479fe 100644
--- a/libao2/ao_dsound.c
+++ b/libao2/ao_dsound.c
@@ -28,6 +28,7 @@
 #define DIRECTSOUND_VERSION 0x0600
 #include <dsound.h>
 
+#include "config.h"
 #include "libaf/af_format.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c
index a850ad6009..2ce2efc7c5 100644
--- a/libao2/ao_esd.c
+++ b/libao2/ao_esd.c
@@ -30,10 +30,10 @@
 #endif
 #include <esd.h>
 
+#include "config.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
-#include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c
index 6e11c9752d..20890d95c0 100644
--- a/libao2/ao_jack.c
+++ b/libao2/ao_jack.c
@@ -12,10 +12,10 @@
 #include <stdio.h>
 #include <jack/jack.h>
 
+#include "config.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
-#include "config.h"
 #include "mp_msg.h"
 
 //#include "bio2jack.h"
diff --git a/libao2/ao_macosx.c b/libao2/ao_macosx.c
index b5956ae650..f3d7c7951a 100644
--- a/libao2/ao_macosx.c
+++ b/libao2/ao_macosx.c
@@ -43,6 +43,7 @@
 #include <inttypes.h>
 #include <pthread.h>
 
+#include "config.h"
 #include "mp_msg.h"
 
 #include "audio_out.h"
diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c
index d3439cbe66..651db6e443 100644
--- a/libao2/ao_nas.c
+++ b/libao2/ao_nas.c
@@ -35,6 +35,7 @@
 
 #include "mp_msg.h"
 
+#include "config.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
diff --git a/libao2/ao_null.c b/libao2/ao_null.c
index 80f3f6c351..6694348af9 100644
--- a/libao2/ao_null.c
+++ b/libao2/ao_null.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
+#include "config.h"
 #include "libaf/af_format.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
diff --git a/libao2/ao_polyp.c b/libao2/ao_polyp.c
index e75d05aaf4..5f9f72eff8 100644
--- a/libao2/ao_polyp.c
+++ b/libao2/ao_polyp.c
@@ -4,10 +4,10 @@
 #include <polyp/polyplib-error.h>
 #include <polyp/mainloop.h>
 
+#include "config.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
-#include "config.h"
 #include "mp_msg.h"
 
 #define	POLYP_CLIENT_NAME "MPlayer"
diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c
index 49159b4324..a35c25114e 100644
--- a/libao2/ao_win32.c
+++ b/libao2/ao_win32.c
@@ -23,6 +23,7 @@
 #include <windows.h>
 #include <mmsystem.h>
 
+#include "config.h"
 #include "libaf/af_format.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"