From 81466b50ceb288ba1192190f51b3de2f9d579177 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sat, 16 Jul 2011 20:50:00 +0000
Subject: [PATCH] Some more EXPORT related fixes.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4493 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 linux/alsa/JackAlsaAdapter.h             |  2 +-
 solaris/oss/JackOSSAdapter.h             | 34 ++++++++++++------------
 windows/portaudio/JackPortAudioAdapter.h |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/linux/alsa/JackAlsaAdapter.h b/linux/alsa/JackAlsaAdapter.h
index e4fbad26..66258c08 100644
--- a/linux/alsa/JackAlsaAdapter.h
+++ b/linux/alsa/JackAlsaAdapter.h
@@ -622,7 +622,7 @@ extern "C"
 #include "JackCompilerDeps.h"
 #include "driver_interface.h"
 
-    EXPORT jack_driver_desc_t* jack_get_descriptor();
+SERVER_EXPORT jack_driver_desc_t* jack_get_descriptor();
 
 #ifdef __cplusplus
 }
diff --git a/solaris/oss/JackOSSAdapter.h b/solaris/oss/JackOSSAdapter.h
index 2cc6ae6b..d96bdd6a 100644
--- a/solaris/oss/JackOSSAdapter.h
+++ b/solaris/oss/JackOSSAdapter.h
@@ -50,17 +50,17 @@ class JackOSSAdapter : public JackAudioAdapterInterface, public JackRunnableInte
 {
 
     enum { kRead = 1, kWrite = 2, kReadWrite = 3 };
-     
+
     private:
-    
+
         JackThread fThread;
-        
+
         char fCaptureDriverName[JACK_CLIENT_NAME_SIZE + 1];
         char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE + 1];
-        
+
         int fInFD;
         int fOutFD;
-        
+
         int fBits;
         int fSampleFormat;
         int fNperiods;
@@ -68,38 +68,38 @@ class JackOSSAdapter : public JackAudioAdapterInterface, public JackRunnableInte
         int	fRWMode;
         bool fIgnoreHW;
         bool fExcl;
-        
+
         unsigned int fInputBufferSize;
         unsigned int fOutputBufferSize;
-        
+
         void* fInputBuffer;
         void* fOutputBuffer;
-        
+
         float** fInputSampleBuffer;
         float** fOutputSampleBuffer;
-        
+
         bool fFirstCycle;
-        
+
         int OpenInput();
         int OpenOutput();
         void CloseAux();
         void SetSampleFormat();
         void DisplayDeviceInfo();
-   
+
     public:
-    
+
         JackOSSAdapter(jack_nframes_t buffer_size, jack_nframes_t sample_rate, const JSList* params);
         ~JackOSSAdapter()
         {}
-        
+
         int Open();
         int Close();
-        
+
         int Read();
         int Write();
-         
+
         int SetBufferSize(jack_nframes_t buffer_size);
-        
+
         bool Execute();
 };
 
@@ -113,7 +113,7 @@ extern "C"
 #include "JackCompilerDeps.h"
 #include "driver_interface.h"
 
-EXPORT jack_driver_desc_t* jack_get_descriptor();
+SERVER_EXPORT jack_driver_desc_t* jack_get_descriptor();
 
 #ifdef __cplusplus
 }
diff --git a/windows/portaudio/JackPortAudioAdapter.h b/windows/portaudio/JackPortAudioAdapter.h
index 73205a40..60e38d37 100644
--- a/windows/portaudio/JackPortAudioAdapter.h
+++ b/windows/portaudio/JackPortAudioAdapter.h
@@ -71,7 +71,7 @@ extern "C"
 #include "JackCompilerDeps.h"
 #include "driver_interface.h"
 
-    EXPORT jack_driver_desc_t* jack_get_descriptor();
+SERVER_EXPORT jack_driver_desc_t* jack_get_descriptor();
 
 #ifdef __cplusplus
 }