changeset 14479:cae0dbeb44bb

af_format.h needs config.h to be included first.
author reimar
date Wed, 12 Jan 2005 22:00:02 +0000
parents d04cbfe4ea8d
children 1d3cc596069d
files libaf/af_format.h libao2/ao_arts.c libao2/ao_dsound.c libao2/ao_esd.c libao2/ao_jack.c libao2/ao_macosx.c libao2/ao_nas.c libao2/ao_null.c libao2/ao_polyp.c libao2/ao_win32.c
diffstat 10 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libaf/af_format.h	Wed Jan 12 21:56:25 2005 +0000
+++ b/libaf/af_format.h	Wed Jan 12 22:00:02 2005 +0000
@@ -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
--- a/libao2/ao_arts.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_arts.c	Wed Jan 12 22:00:02 2005 +0000
@@ -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"
 
--- a/libao2/ao_dsound.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_dsound.c	Wed Jan 12 22:00:02 2005 +0000
@@ -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"
--- a/libao2/ao_esd.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_esd.c	Wed Jan 12 22:00:02 2005 +0000
@@ -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"
 
--- a/libao2/ao_jack.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_jack.c	Wed Jan 12 22:00:02 2005 +0000
@@ -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"
--- a/libao2/ao_macosx.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_macosx.c	Wed Jan 12 22:00:02 2005 +0000
@@ -43,6 +43,7 @@
 #include <inttypes.h>
 #include <pthread.h>
 
+#include "config.h"
 #include "mp_msg.h"
 
 #include "audio_out.h"
--- a/libao2/ao_nas.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_nas.c	Wed Jan 12 22:00:02 2005 +0000
@@ -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"
--- a/libao2/ao_null.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_null.c	Wed Jan 12 22:00:02 2005 +0000
@@ -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"
--- a/libao2/ao_polyp.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_polyp.c	Wed Jan 12 22:00:02 2005 +0000
@@ -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"
--- a/libao2/ao_win32.c	Wed Jan 12 21:56:25 2005 +0000
+++ b/libao2/ao_win32.c	Wed Jan 12 22:00:02 2005 +0000
@@ -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"