changeset 2104:da7a68f68116

Rename internal config.h to audiocompress_config.h to avoid collisions. Reported by Oliver Lehmann <oliver@freebsd.org>.
author William Pitcock <nenolod@atheme.org>
date Fri, 19 Oct 2007 06:14:45 -0500
parents 90f2dcd39e85
children f8dc3d94186d
files src/audiocompress/audacious-glue.c src/audiocompress/audiocompress_config.h src/audiocompress/compress.c src/audiocompress/config.h
diffstat 4 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- 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 {
--- /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
+
--- 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;
--- 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
-