From 36176519fe966423a90774fcd64527142cbbb172 Mon Sep 17 00:00:00 2001
From: Miller Puckette <millerpuckette@users.sourceforge.net>
Date: Tue, 24 Jul 2007 04:53:36 +0000
Subject: Untested attempt to fix compilation problems in s_audio_jack.c

svn path=/trunk/; revision=8229
---
 pd/portaudio/pa_win_wdmks/pa_win_wdmks.c | 2 +-
 pd/portaudio/pablio/ringbuffer.c         | 2 +-
 pd/portaudio/pablio/ringbuffer.h         | 2 +-
 pd/portmidi/pm_mac/pmmacosxcm.c          | 2 +-
 pd/src/s_audio_jack.c                    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'pd')

diff --git a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c
index 6bdc338d..c542f50c 100644
--- a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c
+++ b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_win_wdmks.c,v 1.20 2007-07-24 04:43:41 millerpuckette Exp $
+ * $Id: pa_win_wdmks.c,v 1.21 2007-07-24 04:53:36 millerpuckette Exp $
  * PortAudio Windows WDM-KS interface
  *
  * Author: Andrew Baldwin
diff --git a/pd/portaudio/pablio/ringbuffer.c b/pd/portaudio/pablio/ringbuffer.c
index c38bd5c6..9b944970 100644
--- a/pd/portaudio/pablio/ringbuffer.c
+++ b/pd/portaudio/pablio/ringbuffer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ringbuffer.c,v 1.19 2007-07-24 04:43:41 millerpuckette Exp $
+ * $Id: ringbuffer.c,v 1.20 2007-07-24 04:53:36 millerpuckette Exp $
  * ringbuffer.c
  * Ring Buffer utility..
  *
diff --git a/pd/portaudio/pablio/ringbuffer.h b/pd/portaudio/pablio/ringbuffer.h
index 553cbb2c..3aee18e2 100644
--- a/pd/portaudio/pablio/ringbuffer.h
+++ b/pd/portaudio/pablio/ringbuffer.h
@@ -6,7 +6,7 @@ extern "C"
 #endif /* __cplusplus */
 
 /*
- * $Id: ringbuffer.h,v 1.20 2007-07-24 04:43:41 millerpuckette Exp $
+ * $Id: ringbuffer.h,v 1.21 2007-07-24 04:53:36 millerpuckette Exp $
  * ringbuffer.h
  * Ring Buffer utility..
  *
diff --git a/pd/portmidi/pm_mac/pmmacosxcm.c b/pd/portmidi/pm_mac/pmmacosxcm.c
index de89c214..1ce7ab1f 100644
--- a/pd/portmidi/pm_mac/pmmacosxcm.c
+++ b/pd/portmidi/pm_mac/pmmacosxcm.c
@@ -5,7 +5,7 @@
  * and subsequent work by Andrew Zeldis and Zico Kolter
  * and Roger B. Dannenberg
  *
- * $Id: pmmacosxcm.c,v 1.20 2007-07-24 04:43:41 millerpuckette Exp $
+ * $Id: pmmacosxcm.c,v 1.21 2007-07-24 04:53:36 millerpuckette Exp $
  */
  
 /* Notes:
diff --git a/pd/src/s_audio_jack.c b/pd/src/s_audio_jack.c
index 7f29118e..a6df3968 100644
--- a/pd/src/s_audio_jack.c
+++ b/pd/src/s_audio_jack.c
@@ -194,7 +194,7 @@ static int jack_connect_ports(char* client)
 }
 
 
-void jack_error(const char *desc) {
+void jack_error_callback(const char *desc) {
   return;
 }
 
@@ -244,7 +244,7 @@ jack_open_audio(int inchans, int outchans, int rate)
           
           jack_set_process_callback (jack_client, process, 0);
           
-          jack_set_error_function (jack_error);
+          jack_set_error_function (jack_error_callback);
           
 #ifdef JACK_XRUN
           jack_set_xrun_callback (jack_client, jack_xrun, NULL);
-- 
cgit v1.2.1