From b273f5bf95205f6e8612e69bbfca42a6f1730cd0 Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Wed, 22 Dec 2004 09:41:58 +0000
Subject: [PATCH] Read in configuration settings from config.h. paranoia was
 GNU/Linux based so the #includes had been set specific to that.

---
 lib/paranoia/isort.c    | 10 +++++++++-
 lib/paranoia/overlap.c  | 10 +++++++++-
 lib/paranoia/p_block.c  | 10 +++++++++-
 lib/paranoia/paranoia.c | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/lib/paranoia/isort.c b/lib/paranoia/isort.c
index 2ed823a5..24aca91a 100644
--- a/lib/paranoia/isort.c
+++ b/lib/paranoia/isort.c
@@ -1,5 +1,5 @@
 /*
-  $Id: isort.c,v 1.1 2004/12/18 17:29:32 rocky Exp $
+  $Id: isort.c,v 1.2 2004/12/22 09:41:58 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -23,8 +23,16 @@
 /* Old isort got a bit complex.  This re-constrains complexity to
    give a go at speed through a more alpha-6-like mechanism. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include "p_block.h"
 #include "isort.h"
 
diff --git a/lib/paranoia/overlap.c b/lib/paranoia/overlap.c
index e0cf6c6d..d8f5d496 100644
--- a/lib/paranoia/overlap.c
+++ b/lib/paranoia/overlap.c
@@ -1,5 +1,5 @@
 /*
-  $Id: overlap.c,v 1.1 2004/12/18 17:29:32 rocky Exp $
+  $Id: overlap.c,v 1.2 2004/12/22 09:41:58 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -24,9 +24,17 @@
  *
  ***/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <cdio/paranoia.h>
 #include "p_block.h"
 #include "overlap.h"
diff --git a/lib/paranoia/p_block.c b/lib/paranoia/p_block.c
index 5546e826..dc504807 100644
--- a/lib/paranoia/p_block.c
+++ b/lib/paranoia/p_block.c
@@ -1,5 +1,5 @@
 /*
-    $Id: p_block.c,v 1.1 2004/12/18 17:29:32 rocky Exp $
+    $Id: p_block.c,v 1.2 2004/12/22 09:41:58 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -19,9 +19,17 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <limits.h>
 #include "p_block.h"
 #include <cdio/cdda_interface.h>
diff --git a/lib/paranoia/paranoia.c b/lib/paranoia/paranoia.c
index a88b9e19..b55bcd68 100644
--- a/lib/paranoia/paranoia.c
+++ b/lib/paranoia/paranoia.c
@@ -1,5 +1,5 @@
 /*
-  $Id: paranoia.c,v 1.1 2004/12/18 17:29:32 rocky Exp $
+  $Id: paranoia.c,v 1.2 2004/12/22 09:41:58 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -63,10 +63,18 @@
 
   **************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 #include <unistd.h>
 #include <stdio.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <math.h>
 #include <cdio/cdda_interface.h>
 #include "../cdda_interface/smallft.h"