# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1192792485 18000
# Node ID da7a68f68116f01cfd32ac495dcb7fe8813d2aa6
# Parent  90f2dcd39e85cd70b168bbf97b57c13b93da12b7
Rename internal config.h to audiocompress_config.h to avoid collisions.
Reported by Oliver Lehmann <oliver@freebsd.org>.

diff -r 90f2dcd39e85 -r da7a68f68116 src/audiocompress/audacious-glue.c
--- a/src/audiocompress/audacious-glue.c	Fri Oct 19 05:45:48 2007 -0500
+++ b/src/audiocompress/audacious-glue.c	Fri Oct 19 06:14:45 2007 -0500
@@ -13,7 +13,7 @@
 #include <audacious/util.h>
 #include <audacious/configdb.h>
 
-#include "config.h"
+#include "audiocompress_config.h"
 #include "compress.h"
 
 typedef struct {
diff -r 90f2dcd39e85 -r da7a68f68116 src/audiocompress/audiocompress_config.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audiocompress/audiocompress_config.h	Fri Oct 19 06:14:45 2007 -0500
@@ -0,0 +1,25 @@
+/* audiocompress_config.h
+** Default values for the configuration, and also a few random debug things
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+/*** Version information ***/
+#define ACVERSION "1.5.2"
+
+/*** Monitoring stuff ***/
+//#define DEBUG			/* Show debugging information */
+//#define STATS			/* Show statistics on stderr */
+
+/*** Default configuration stuff ***/
+#define ANTICLIP 0		/* Strict clipping protection */
+#define TARGET 25000		/* Target level */
+
+#define GAINMAX 32		/* The maximum amount to amplify by */
+#define GAINSHIFT 10		/* How fine-grained the gain is */
+#define GAINSMOOTH 8		/* How much inertia ramping has*/
+#define BUCKETS 400		/* How long of a history to store */
+
+#endif
+
diff -r 90f2dcd39e85 -r da7a68f68116 src/audiocompress/compress.c
--- a/src/audiocompress/compress.c	Fri Oct 19 05:45:48 2007 -0500
+++ b/src/audiocompress/compress.c	Fri Oct 19 06:14:45 2007 -0500
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "config.h"
+#include "audiocompress_config.h"
 #include "compress.h"
 
 static int *peaks = NULL;
diff -r 90f2dcd39e85 -r da7a68f68116 src/audiocompress/config.h
--- a/src/audiocompress/config.h	Fri Oct 19 05:45:48 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/* config.h
-** Default values for the configuration, and also a few random debug things
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-/*** Version information ***/
-#define ACVERSION "1.5.2"
-
-/*** Monitoring stuff ***/
-//#define DEBUG			/* Show debugging information */
-//#define STATS			/* Show statistics on stderr */
-
-/*** Default configuration stuff ***/
-#define ANTICLIP 0		/* Strict clipping protection */
-#define TARGET 25000		/* Target level */
-
-#define GAINMAX 32		/* The maximum amount to amplify by */
-#define GAINSHIFT 10		/* How fine-grained the gain is */
-#define GAINSMOOTH 8		/* How much inertia ramping has*/
-#define BUCKETS 400		/* How long of a history to store */
-
-#endif
-