EXPORT macro renamed to LIB_EXPORT.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4492 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -38,6 +38,7 @@ Chris Caudle
 2011-07-16 Stephane Letz  <letz@grame.fr>
 
 	* Error in JackActivationCount::Signal now uses jack_log instead of jack_error.
+	* EXPORT macro renamed to LIB_EXPORT.
 
 2011-07-12 Stephane Letz  <letz@grame.fr>
 

common/JackControlAPI.cpp

@@ -215,7 +215,7 @@ bool
 jackctl_add_driver_parameters(
     struct jackctl_driver * driver_ptr)
 {
-    unsigned int i;
+    unsigned int i;
 
     union jackctl_parameter_value jackctl_value;
     jackctl_param_type_t jackctl_type;
@@ -486,7 +486,7 @@ do_nothing_handler(int sig)
     snprintf (buf, sizeof(buf), "received signal %d during shutdown (ignored)\n", sig);
 }
 
-EXPORT sigset_t
+LIB_EXPORT sigset_t
 jackctl_setup_signals(
     unsigned int flags)
 {
@@ -564,7 +564,7 @@ jackctl_setup_signals(
     return signals;
 }
 
-EXPORT void
+LIB_EXPORT void
 jackctl_wait_signals(sigset_t signals)
 {
     int sig;
@@ -631,7 +631,7 @@ get_realtime_priority_constraint()
     return constraint_ptr;
 }
 
-EXPORT jackctl_server_t * jackctl_server_create(
+LIB_EXPORT jackctl_server_t * jackctl_server_create(
     bool (* on_device_acquire)(const char * device_name),
     void (* on_device_release)(const char * device_name))
 {
@@ -813,7 +813,7 @@ fail:
     return NULL;
 }
 
-EXPORT void jackctl_server_destroy(jackctl_server *server_ptr)
+LIB_EXPORT void jackctl_server_destroy(jackctl_server *server_ptr)
 {
     jackctl_server_free_drivers(server_ptr);
     jackctl_server_free_internals(server_ptr);
@@ -821,18 +821,18 @@ EXPORT void jackctl_server_destroy(jackctl_server *server_ptr)
     free(server_ptr);
 }
 
-EXPORT const JSList * jackctl_server_get_drivers_list(jackctl_server *server_ptr)
+LIB_EXPORT const JSList * jackctl_server_get_drivers_list(jackctl_server *server_ptr)
 {
     return server_ptr->drivers;
 }
 
-EXPORT bool jackctl_server_stop(jackctl_server *server_ptr)
+LIB_EXPORT bool jackctl_server_stop(jackctl_server *server_ptr)
 {
     server_ptr->engine->Stop();
     return true;
 }
 
-EXPORT bool jackctl_server_close(jackctl_server *server_ptr)
+LIB_EXPORT bool jackctl_server_close(jackctl_server *server_ptr)
 {
     server_ptr->engine->Close();
     delete server_ptr->engine;
@@ -855,12 +855,12 @@ EXPORT bool jackctl_server_close(jackctl_server *server_ptr)
     return true;
 }
 
-EXPORT const JSList * jackctl_server_get_parameters(jackctl_server *server_ptr)
+LIB_EXPORT const JSList * jackctl_server_get_parameters(jackctl_server *server_ptr)
 {
     return server_ptr->parameters;
 }
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_server_open(
     jackctl_server *server_ptr,
     jackctl_driver *driver_ptr)
@@ -944,7 +944,7 @@ fail:
     return false;
 }
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_server_start(
     jackctl_server *server_ptr)
 {
@@ -957,47 +957,47 @@ jackctl_server_start(
     return result;
 }
 
-EXPORT const char * jackctl_driver_get_name(jackctl_driver *driver_ptr)
+LIB_EXPORT const char * jackctl_driver_get_name(jackctl_driver *driver_ptr)
 {
     return driver_ptr->desc_ptr->name;
 }
 
-EXPORT const JSList * jackctl_driver_get_parameters(jackctl_driver *driver_ptr)
+LIB_EXPORT const JSList * jackctl_driver_get_parameters(jackctl_driver *driver_ptr)
 {
     return driver_ptr->parameters;
 }
 
-EXPORT jack_driver_desc_t * jackctl_driver_get_desc(jackctl_driver *driver_ptr)
+LIB_EXPORT jack_driver_desc_t * jackctl_driver_get_desc(jackctl_driver *driver_ptr)
 {
     return driver_ptr->desc_ptr;
 }
 
-EXPORT const char * jackctl_parameter_get_name(jackctl_parameter *parameter_ptr)
+LIB_EXPORT const char * jackctl_parameter_get_name(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->name;
 }
 
-EXPORT const char * jackctl_parameter_get_short_description(jackctl_parameter *parameter_ptr)
+LIB_EXPORT const char * jackctl_parameter_get_short_description(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->short_description;
 }
 
-EXPORT const char * jackctl_parameter_get_long_description(jackctl_parameter *parameter_ptr)
+LIB_EXPORT const char * jackctl_parameter_get_long_description(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->long_description;
 }
 
-EXPORT bool jackctl_parameter_has_range_constraint(jackctl_parameter *parameter_ptr)
+LIB_EXPORT bool jackctl_parameter_has_range_constraint(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->constraint_ptr != NULL && (parameter_ptr->constraint_ptr->flags & JACK_CONSTRAINT_FLAG_RANGE) != 0;
 }
 
-EXPORT bool jackctl_parameter_has_enum_constraint(jackctl_parameter *parameter_ptr)
+LIB_EXPORT bool jackctl_parameter_has_enum_constraint(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->constraint_ptr != NULL && (parameter_ptr->constraint_ptr->flags & JACK_CONSTRAINT_FLAG_RANGE) == 0;
 }
 
-EXPORT uint32_t jackctl_parameter_get_enum_constraints_count(jackctl_parameter *parameter_ptr)
+LIB_EXPORT uint32_t jackctl_parameter_get_enum_constraints_count(jackctl_parameter *parameter_ptr)
 {
     if (!jackctl_parameter_has_enum_constraint(parameter_ptr))
     {
@@ -1007,7 +1007,7 @@ EXPORT uint32_t jackctl_parameter_get_enum_constraints_count(jackctl_parameter *
     return parameter_ptr->constraint_ptr->constraint.enumeration.count;
 }
 
-EXPORT union jackctl_parameter_value jackctl_parameter_get_enum_constraint_value(jackctl_parameter *parameter_ptr, uint32_t index)
+LIB_EXPORT union jackctl_parameter_value jackctl_parameter_get_enum_constraint_value(jackctl_parameter *parameter_ptr, uint32_t index)
 {
     jack_driver_param_value_t * value_ptr;
     union jackctl_parameter_value jackctl_value;
@@ -1036,12 +1036,12 @@ EXPORT union jackctl_parameter_value jackctl_parameter_get_enum_constraint_value
     return jackctl_value;
 }
 
-EXPORT const char * jackctl_parameter_get_enum_constraint_description(jackctl_parameter *parameter_ptr, uint32_t index)
+LIB_EXPORT const char * jackctl_parameter_get_enum_constraint_description(jackctl_parameter *parameter_ptr, uint32_t index)
 {
     return parameter_ptr->constraint_ptr->constraint.enumeration.possible_values_array[index].short_desc;
 }
 
-EXPORT void jackctl_parameter_get_range_constraint(jackctl_parameter *parameter_ptr, union jackctl_parameter_value * min_ptr, union jackctl_parameter_value * max_ptr)
+LIB_EXPORT void jackctl_parameter_get_range_constraint(jackctl_parameter *parameter_ptr, union jackctl_parameter_value * min_ptr, union jackctl_parameter_value * max_ptr)
 {
     switch (parameter_ptr->type)
     {
@@ -1059,37 +1059,37 @@ EXPORT void jackctl_parameter_get_range_constraint(jackctl_parameter *parameter_
     }
 }
 
-EXPORT bool jackctl_parameter_constraint_is_strict(jackctl_parameter_t * parameter_ptr)
+LIB_EXPORT bool jackctl_parameter_constraint_is_strict(jackctl_parameter_t * parameter_ptr)
 {
     return parameter_ptr->constraint_ptr != NULL && (parameter_ptr->constraint_ptr->flags & JACK_CONSTRAINT_FLAG_STRICT) != 0;
 }
 
-EXPORT bool jackctl_parameter_constraint_is_fake_value(jackctl_parameter_t * parameter_ptr)
+LIB_EXPORT bool jackctl_parameter_constraint_is_fake_value(jackctl_parameter_t * parameter_ptr)
 {
     return parameter_ptr->constraint_ptr != NULL && (parameter_ptr->constraint_ptr->flags & JACK_CONSTRAINT_FLAG_FAKE_VALUE) != 0;
 }
 
-EXPORT jackctl_param_type_t jackctl_parameter_get_type(jackctl_parameter *parameter_ptr)
+LIB_EXPORT jackctl_param_type_t jackctl_parameter_get_type(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->type;
 }
 
-EXPORT char jackctl_parameter_get_id(jackctl_parameter_t * parameter_ptr)
+LIB_EXPORT char jackctl_parameter_get_id(jackctl_parameter_t * parameter_ptr)
 {
     return parameter_ptr->id;
 }
 
-EXPORT bool jackctl_parameter_is_set(jackctl_parameter *parameter_ptr)
+LIB_EXPORT bool jackctl_parameter_is_set(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->is_set;
 }
 
-EXPORT union jackctl_parameter_value jackctl_parameter_get_value(jackctl_parameter *parameter_ptr)
+LIB_EXPORT union jackctl_parameter_value jackctl_parameter_get_value(jackctl_parameter *parameter_ptr)
 {
     return *parameter_ptr->value_ptr;
 }
 
-EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
+LIB_EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
 {
     if (!parameter_ptr->is_set)
     {
@@ -1103,7 +1103,7 @@ EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
     return true;
 }
 
-EXPORT bool jackctl_parameter_set_value(jackctl_parameter *parameter_ptr, const union jackctl_parameter_value * value_ptr)
+LIB_EXPORT bool jackctl_parameter_set_value(jackctl_parameter *parameter_ptr, const union jackctl_parameter_value * value_ptr)
 {
     bool new_driver_parameter;
 
@@ -1162,29 +1162,29 @@ EXPORT bool jackctl_parameter_set_value(jackctl_parameter *parameter_ptr, const
     return true;
 }
 
-EXPORT union jackctl_parameter_value jackctl_parameter_get_default_value(jackctl_parameter *parameter_ptr)
+LIB_EXPORT union jackctl_parameter_value jackctl_parameter_get_default_value(jackctl_parameter *parameter_ptr)
 {
     return *parameter_ptr->default_value_ptr;
 }
 
 // Internals clients
 
-EXPORT const JSList * jackctl_server_get_internals_list(jackctl_server *server_ptr)
+LIB_EXPORT const JSList * jackctl_server_get_internals_list(jackctl_server *server_ptr)
 {
     return server_ptr->internals;
 }
 
-EXPORT const char * jackctl_internal_get_name(jackctl_internal *internal_ptr)
+LIB_EXPORT const char * jackctl_internal_get_name(jackctl_internal *internal_ptr)
 {
     return internal_ptr->desc_ptr->name;
 }
 
-EXPORT const JSList * jackctl_internal_get_parameters(jackctl_internal *internal_ptr)
+LIB_EXPORT const JSList * jackctl_internal_get_parameters(jackctl_internal *internal_ptr)
 {
     return internal_ptr->parameters;
 }
 
-EXPORT bool jackctl_server_load_internal(
+LIB_EXPORT bool jackctl_server_load_internal(
     jackctl_server * server_ptr,
     jackctl_internal * internal)
 {
@@ -1197,7 +1197,7 @@ EXPORT bool jackctl_server_load_internal(
     }
 }
 
-EXPORT bool jackctl_server_unload_internal(
+LIB_EXPORT bool jackctl_server_unload_internal(
     jackctl_server * server_ptr,
     jackctl_internal * internal)
 {
@@ -1210,7 +1210,7 @@ EXPORT bool jackctl_server_unload_internal(
     }
 }
 
-EXPORT bool jackctl_server_add_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+LIB_EXPORT bool jackctl_server_add_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
 {
     if (server_ptr->engine != NULL) {
         if (server_ptr->engine->IsRunning()) {
@@ -1230,20 +1230,20 @@ EXPORT bool jackctl_server_add_slave(jackctl_server * server_ptr, jackctl_driver
     }
 }
 
-EXPORT bool jackctl_server_remove_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+LIB_EXPORT bool jackctl_server_remove_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
 {
     if (server_ptr->engine != NULL) {
         if (server_ptr->engine->IsRunning()) {
             jack_error("cannot remove a slave from a running server");
             return false;
-        } else {
-            if (driver_ptr->infos) {
-                JackDriverInfo* info = (JackDriverInfo*)driver_ptr->infos->data;
-                assert(info);
+        } else {
+            if (driver_ptr->infos) {
+                JackDriverInfo* info = (JackDriverInfo*)driver_ptr->infos->data;
+                assert(info);
                 driver_ptr->infos = jack_slist_remove(driver_ptr->infos, info);
                 server_ptr->engine->RemoveSlave(info);
                 delete info;
-                return true;
+                return true;
             } else {
                 return false;
             }
@@ -1253,7 +1253,7 @@ EXPORT bool jackctl_server_remove_slave(jackctl_server * server_ptr, jackctl_dri
     }
 }
 
-EXPORT bool jackctl_server_switch_master(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+LIB_EXPORT bool jackctl_server_switch_master(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
 {
     if (server_ptr->engine != NULL) {
         return (server_ptr->engine->SwitchMaster(driver_ptr->desc_ptr, driver_ptr->set_parameters) == 0);
@@ -1262,3 +1262,4 @@ EXPORT bool jackctl_server_switch_master(jackctl_server * server_ptr, jackctl_dr
     }
 }
 
+

common/JackControlAPI.h

@@ -27,7 +27,7 @@
 
 #ifdef WIN32
 #ifdef __MINGW32__
-#include <sys/types.h>
+#include <sys/types.h>
 typedef _sigset_t	sigset_t;
 #else
 typedef HANDLE sigset_t;
@@ -80,164 +80,164 @@ extern "C" {
 } /* Adjust editor indent */
 #endif
 
-EXPORT sigset_t
+LIB_EXPORT sigset_t
 jackctl_setup_signals(
     unsigned int flags);
 
-EXPORT void
+LIB_EXPORT void
 jackctl_wait_signals(
     sigset_t signals);
 
-EXPORT jackctl_server_t *
+LIB_EXPORT jackctl_server_t *
 jackctl_server_create(
     bool (* on_device_acquire)(const char * device_name),
     void (* on_device_release)(const char * device_name));
 
-EXPORT void
+LIB_EXPORT void
 jackctl_server_destroy(
 	jackctl_server_t * server);
 
-EXPORT const JSList *
+LIB_EXPORT const JSList *
 jackctl_server_get_drivers_list(
 	jackctl_server_t * server);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_server_open(
     jackctl_server_t * server,
     jackctl_driver_t * driver);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_server_start(
     jackctl_server_t * server);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_server_stop(
     jackctl_server_t * server);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_server_close(
     jackctl_server_t * server);
 
-EXPORT const JSList *
+LIB_EXPORT const JSList *
 jackctl_server_get_parameters(
 	jackctl_server_t * server);
 
-EXPORT const char *
+LIB_EXPORT const char *
 jackctl_driver_get_name(
 	jackctl_driver_t * driver);
 
-EXPORT const JSList *
+LIB_EXPORT const JSList *
 jackctl_driver_get_parameters(
 	jackctl_driver_t * driver);
 
-EXPORT const char *
+LIB_EXPORT const char *
 jackctl_parameter_get_name(
 	jackctl_parameter_t * parameter);
 
-EXPORT const char *
+LIB_EXPORT const char *
 jackctl_parameter_get_short_description(
 	jackctl_parameter_t * parameter);
 
-EXPORT const char *
+LIB_EXPORT const char *
 jackctl_parameter_get_long_description(
 	jackctl_parameter_t * parameter);
 
-EXPORT jackctl_param_type_t
+LIB_EXPORT jackctl_param_type_t
 jackctl_parameter_get_type(
 	jackctl_parameter_t * parameter);
 
-EXPORT char
+LIB_EXPORT char
 jackctl_parameter_get_id(
 	jackctl_parameter_t * parameter);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_parameter_is_set(
 	jackctl_parameter_t * parameter);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_parameter_reset(
 	jackctl_parameter_t * parameter);
 
-EXPORT union jackctl_parameter_value
+LIB_EXPORT union jackctl_parameter_value
 jackctl_parameter_get_value(
 	jackctl_parameter_t * parameter);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_parameter_set_value(
 	jackctl_parameter_t * parameter,
 	const union jackctl_parameter_value * value_ptr);
 
-EXPORT union jackctl_parameter_value
+LIB_EXPORT union jackctl_parameter_value
 jackctl_parameter_get_default_value(
 	jackctl_parameter_t * parameter);
 
-EXPORT union jackctl_parameter_value
+LIB_EXPORT union jackctl_parameter_value
 jackctl_parameter_get_default_value(
     jackctl_parameter *parameter_ptr);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_parameter_has_range_constraint(
 	jackctl_parameter_t * parameter_ptr);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_parameter_has_enum_constraint(
 	jackctl_parameter_t * parameter_ptr);
 
-EXPORT uint32_t
+LIB_EXPORT uint32_t
 jackctl_parameter_get_enum_constraints_count(
 	jackctl_parameter_t * parameter_ptr);
 
-EXPORT union jackctl_parameter_value
+LIB_EXPORT union jackctl_parameter_value
 jackctl_parameter_get_enum_constraint_value(
 	jackctl_parameter_t * parameter_ptr,
 	uint32_t index);
 
-EXPORT const char *
+LIB_EXPORT const char *
 jackctl_parameter_get_enum_constraint_description(
 	jackctl_parameter_t * parameter_ptr,
 	uint32_t index);
 
-EXPORT void
+LIB_EXPORT void
 jackctl_parameter_get_range_constraint(
 	jackctl_parameter_t * parameter_ptr,
 	union jackctl_parameter_value * min_ptr,
 	union jackctl_parameter_value * max_ptr);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_parameter_constraint_is_strict(
 	jackctl_parameter_t * parameter_ptr);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_parameter_constraint_is_fake_value(
 	jackctl_parameter_t * parameter_ptr);
 
-EXPORT const JSList *
+LIB_EXPORT const JSList *
 jackctl_server_get_internals_list(
     jackctl_server *server_ptr);
 
-EXPORT const char *
+LIB_EXPORT const char *
 jackctl_internal_get_name(
     jackctl_internal *internal_ptr);
 
-EXPORT const JSList *
+LIB_EXPORT const JSList *
 jackctl_internal_get_parameters(
     jackctl_internal *internal_ptr);
 
-EXPORT bool jackctl_server_load_internal(
+LIB_EXPORT bool jackctl_server_load_internal(
     jackctl_server * server,
     jackctl_internal * internal);
 
-EXPORT bool jackctl_server_unload_internal(
+LIB_EXPORT bool jackctl_server_unload_internal(
     jackctl_server * server,
     jackctl_internal * internal);
 
-EXPORT bool jackctl_server_add_slave(jackctl_server_t * server,
+LIB_EXPORT bool jackctl_server_add_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
-EXPORT bool jackctl_server_remove_slave(jackctl_server_t * server,
+LIB_EXPORT bool jackctl_server_remove_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
-EXPORT bool
+LIB_EXPORT bool
 jackctl_server_switch_master(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
@@ -249,3 +249,4 @@ jackctl_server_switch_master(jackctl_server_t * server,
 #endif
 
 #endif
+

common/JackDriverLoader.cpp

@@ -88,7 +88,7 @@ SERVER_EXPORT void jack_free_driver_params(JSList * driver_params)
     }
 }
 
-EXPORT int
+LIB_EXPORT int
 jack_parse_driver_params(jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr)
 {
     struct option * long_options;
@@ -835,7 +835,7 @@ JackDriverInfo::~JackDriverInfo()
         UnloadDriverModule(fHandle);
 }
 
-EXPORT
+LIB_EXPORT
 jack_driver_desc_t *
 jack_driver_descriptor_construct(
     const char * name,
@@ -873,7 +873,7 @@ jack_driver_descriptor_construct(
     return desc_ptr;
 }
 
-EXPORT
+LIB_EXPORT
 int
 jack_driver_descriptor_add_parameter(
     jack_driver_desc_t * desc_ptr,

common/JackGlobals.h

@@ -53,9 +53,9 @@ struct JackGlobals {
 };
 
 // Each "side" server and client will implement this to get the shared graph manager, engine control and inter-process synchro table.
-extern EXPORT JackGraphManager* GetGraphManager();
-extern EXPORT JackEngineControl* GetEngineControl();
-extern EXPORT JackSynchro* GetSynchroTable();
+extern LIB_EXPORT JackGraphManager* GetGraphManager();
+extern LIB_EXPORT JackEngineControl* GetEngineControl();
+extern LIB_EXPORT JackSynchro* GetSynchroTable();
 
 } // end of namespace
 

common/JackInternalClient.cpp

@@ -38,17 +38,17 @@ JackGraphManager* JackInternalClient::fGraphManager = NULL;
 JackEngineControl* JackInternalClient::fEngineControl = NULL;
 
 // Used for external C API (JackAPI.cpp)
-EXPORT JackGraphManager* GetGraphManager()
+LIB_EXPORT JackGraphManager* GetGraphManager()
 {
     return JackServerGlobals::fInstance->GetGraphManager();
 }
 
-EXPORT JackEngineControl* GetEngineControl()
+LIB_EXPORT JackEngineControl* GetEngineControl()
 {
     return JackServerGlobals::fInstance->GetEngineControl();
 }
 
-EXPORT JackSynchro* GetSynchroTable()
+LIB_EXPORT JackSynchro* GetSynchroTable()
 {
     return JackServerGlobals::fInstance->GetSynchroTable();
 }

common/JackLibAPI.cpp

@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software 
+along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
@@ -42,11 +42,11 @@ extern "C"
     jack_client_t * jack_client_open_aux (const char *client_name,
             jack_options_t options,
             jack_status_t *status, va_list ap);
-    EXPORT jack_client_t * jack_client_open (const char *client_name,
+    LIB_EXPORT jack_client_t * jack_client_open (const char *client_name,
             jack_options_t options,
             jack_status_t *status, ...);
-    EXPORT int jack_client_close (jack_client_t *client);
-    EXPORT int jack_get_client_pid (const char *name);
+    LIB_EXPORT int jack_client_close (jack_client_t *client);
+    LIB_EXPORT int jack_get_client_pid (const char *name);
 
 #ifdef __cplusplus
 }
@@ -60,14 +60,14 @@ jack_client_t* jack_client_new_aux(const char* client_name, jack_options_t optio
     jack_varargs_t va;          /* variable arguments */
     jack_status_t my_status;
     JackClient* client;
- 
+
     if (client_name == NULL) {
         jack_error("jack_client_new called with a NULL client_name");
         return NULL;
     }
 
     jack_log("jack_client_new %s", client_name);
-   
+
     if (status == NULL)         /* no status from caller? */
         status = &my_status;    /* use local status word */
     *status = (jack_status_t)0;
@@ -81,7 +81,7 @@ jack_client_t* jack_client_new_aux(const char* client_name, jack_options_t optio
 
     /* parse variable arguments */
     jack_varargs_init(&va);
-        
+
     JackLibGlobals::Init(); // jack library initialisation
 
     if (try_start_server(&va, options, status)) {
@@ -113,14 +113,14 @@ jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t opti
     jack_varargs_t va;		/* variable arguments */
     jack_status_t my_status;
     JackClient* client;
- 
+
     if (client_name == NULL) {
         jack_error("jack_client_open called with a NULL client_name");
         return NULL;
     }
 
     jack_log("jack_client_open %s", client_name);
-   
+
     if (status == NULL)			/* no status from caller? */
         status = &my_status;	/* use local status word */
     *status = (jack_status_t)0;
@@ -134,7 +134,7 @@ jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t opti
 
     /* parse variable arguments */
     jack_varargs_parse(options, ap, &va);
-        
+
     JackLibGlobals::Init(); // jack library initialisation
 
     if (try_start_server(&va, options, status)) {
@@ -161,7 +161,7 @@ jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t opti
     }
 }
 
-EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
+LIB_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
 {
 #ifdef __CLIENTDEBUG__
         JackGlobals::CheckContext("jack_client_open");
@@ -184,7 +184,7 @@ EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options
     }
 }
 
-EXPORT int jack_client_close(jack_client_t* ext_client)
+LIB_EXPORT int jack_client_close(jack_client_t* ext_client)
 {
 #ifdef __CLIENTDEBUG__
     JackGlobals::CheckContext("jack_client_close");
@@ -206,7 +206,7 @@ EXPORT int jack_client_close(jack_client_t* ext_client)
     return res;
 }
 
-EXPORT int jack_get_client_pid(const char *name)
+LIB_EXPORT int jack_get_client_pid(const char *name)
 {
     jack_error("jack_get_client_pid : not implemented on library side");
     return 0;

common/JackMidiAPI.cpp

@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software 
+along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
@@ -30,22 +30,22 @@ extern "C"
 {
 #endif
 
-    EXPORT jack_nframes_t jack_midi_get_event_count(void* port_buffer);
+    LIB_EXPORT jack_nframes_t jack_midi_get_event_count(void* port_buffer);
 
-    EXPORT int jack_midi_event_get(jack_midi_event_t* event,
+    LIB_EXPORT int jack_midi_event_get(jack_midi_event_t* event,
                                    void* port_buffer, jack_nframes_t event_index);
 
-    EXPORT void jack_midi_clear_buffer(void* port_buffer);
+    LIB_EXPORT void jack_midi_clear_buffer(void* port_buffer);
 
-    EXPORT size_t jack_midi_max_event_size(void* port_buffer);
+    LIB_EXPORT size_t jack_midi_max_event_size(void* port_buffer);
 
-    EXPORT jack_midi_data_t* jack_midi_event_reserve(void* port_buffer,
+    LIB_EXPORT jack_midi_data_t* jack_midi_event_reserve(void* port_buffer,
             jack_nframes_t time, size_t data_size);
 
-    EXPORT int jack_midi_event_write(void* port_buffer,
+    LIB_EXPORT int jack_midi_event_write(void* port_buffer,
                                      jack_nframes_t time, const jack_midi_data_t* data, size_t data_size);
 
-    EXPORT jack_nframes_t jack_midi_get_lost_event_count(void* port_buffer);
+    LIB_EXPORT jack_nframes_t jack_midi_get_lost_event_count(void* port_buffer);
 
 #ifdef __cplusplus
 }
@@ -53,7 +53,7 @@ extern "C"
 
 using namespace Jack;
 
-EXPORT
+LIB_EXPORT
 jack_nframes_t jack_midi_get_event_count(void* port_buffer)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
@@ -62,7 +62,7 @@ jack_nframes_t jack_midi_get_event_count(void* port_buffer)
     return buf->event_count;
 }
 
-EXPORT
+LIB_EXPORT
 int jack_midi_event_get(jack_midi_event_t *event, void* port_buffer, jack_nframes_t event_index)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
@@ -77,7 +77,7 @@ int jack_midi_event_get(jack_midi_event_t *event, void* port_buffer, jack_nframe
     return 0;
 }
 
-EXPORT
+LIB_EXPORT
 void jack_midi_clear_buffer(void* port_buffer)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
@@ -85,7 +85,7 @@ void jack_midi_clear_buffer(void* port_buffer)
         buf->Reset(buf->nframes);
 }
 
-EXPORT
+LIB_EXPORT
 size_t jack_midi_max_event_size(void* port_buffer)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
@@ -94,7 +94,7 @@ size_t jack_midi_max_event_size(void* port_buffer)
     return 0;
 }
 
-EXPORT
+LIB_EXPORT
 jack_midi_data_t* jack_midi_event_reserve(void* port_buffer, jack_nframes_t time, size_t data_size)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
@@ -119,7 +119,7 @@ jack_midi_data_t* jack_midi_event_reserve(void* port_buffer, jack_nframes_t time
     return buf->ReserveEvent(time, data_size);
 }
 
-EXPORT
+LIB_EXPORT
 int jack_midi_event_write(void* port_buffer,
                           jack_nframes_t time, const jack_midi_data_t* data, size_t data_size)
 {
@@ -135,7 +135,7 @@ int jack_midi_event_write(void* port_buffer,
     return 0;
 }
 
-EXPORT
+LIB_EXPORT
 jack_nframes_t jack_midi_get_lost_event_count(void* port_buffer)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;

common/JackServerAPI.cpp

@@ -39,11 +39,11 @@ extern "C"
     jack_client_t * jack_client_open_aux (const char *client_name,
             jack_options_t options,
             jack_status_t *status, va_list ap);
-    EXPORT jack_client_t * jack_client_open (const char *client_name,
+    LIB_EXPORT jack_client_t * jack_client_open (const char *client_name,
             jack_options_t options,
             jack_status_t *status, ...);
-    EXPORT int jack_client_close (jack_client_t *client);
-    EXPORT int jack_get_client_pid (const char *name);
+    LIB_EXPORT int jack_client_close (jack_client_t *client);
+    LIB_EXPORT int jack_get_client_pid (const char *name);
 
 #ifdef __cplusplus
 }
@@ -153,7 +153,7 @@ jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t opti
     }
 }
 
-EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
+LIB_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
 {
 #ifdef __CLIENTDEBUG__
     JackGlobals::CheckContext("jack_client_open");
@@ -176,7 +176,7 @@ EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options
     }
 }
 
-EXPORT int jack_client_close(jack_client_t* ext_client)
+LIB_EXPORT int jack_client_close(jack_client_t* ext_client)
 {
 #ifdef __CLIENTDEBUG__
     JackGlobals::CheckContext("jack_client_close");
@@ -198,7 +198,7 @@ EXPORT int jack_client_close(jack_client_t* ext_client)
     return res;
 }
 
-EXPORT int jack_get_client_pid(const char *name)
+LIB_EXPORT int jack_get_client_pid(const char *name)
 {
     return (JackServerGlobals::fInstance != NULL)
         ? JackServerGlobals::fInstance->GetEngine()->GetClientPID(name)

common/driver_interface.h

@@ -115,16 +115,16 @@ typedef struct {
 }
 jack_driver_desc_filler_t;
 
-EXPORT int jack_parse_driver_params(jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
+LIB_EXPORT int jack_parse_driver_params(jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
 
-EXPORT jack_driver_desc_t *            /* newlly allocated driver descriptor, NULL on failure */
+LIB_EXPORT jack_driver_desc_t *            /* newlly allocated driver descriptor, NULL on failure */
 jack_driver_descriptor_construct(
     const char * name,          /* driver name */
     const char * description,   /* driver description */
     jack_driver_desc_filler_t * filler); /* Pointer to stack var to be supplied to jack_driver_descriptor_add_parameter() as well.
                                             Can be NULL for drivers that have no parameters. */
 
-EXPORT int                            /* 0 on failure */
+LIB_EXPORT int                            /* 0 on failure */
 jack_driver_descriptor_add_parameter(
     jack_driver_desc_t * driver_descr,  /* pointer to driver descriptor as returned by jack_driver_descriptor_construct() */
     jack_driver_desc_filler_t * filler, /* Pointer to the stack var that was supplied to jack_driver_descriptor_add_parameter(). */

common/ringbuffer.c

@@ -43,20 +43,20 @@ typedef struct {
 }
 jack_ringbuffer_t ;
 
-EXPORT jack_ringbuffer_t *jack_ringbuffer_create(size_t sz);
-EXPORT void jack_ringbuffer_free(jack_ringbuffer_t *rb);
-EXPORT void jack_ringbuffer_get_read_vector(const jack_ringbuffer_t *rb,
+LIB_EXPORT jack_ringbuffer_t *jack_ringbuffer_create(size_t sz);
+LIB_EXPORT void jack_ringbuffer_free(jack_ringbuffer_t *rb);
+LIB_EXPORT void jack_ringbuffer_get_read_vector(const jack_ringbuffer_t *rb,
                                          jack_ringbuffer_data_t *vec);
-EXPORT void jack_ringbuffer_get_write_vector(const jack_ringbuffer_t *rb,
+LIB_EXPORT void jack_ringbuffer_get_write_vector(const jack_ringbuffer_t *rb,
                                           jack_ringbuffer_data_t *vec);
-EXPORT size_t jack_ringbuffer_read(jack_ringbuffer_t *rb, char *dest, size_t cnt);
-EXPORT size_t jack_ringbuffer_peek(jack_ringbuffer_t *rb, char *dest, size_t cnt);
-EXPORT void jack_ringbuffer_read_advance(jack_ringbuffer_t *rb, size_t cnt);
-EXPORT size_t jack_ringbuffer_read_space(const jack_ringbuffer_t *rb);
-EXPORT int jack_ringbuffer_mlock(jack_ringbuffer_t *rb);
-EXPORT void jack_ringbuffer_reset(jack_ringbuffer_t *rb);
-EXPORT void jack_ringbuffer_reset_size (jack_ringbuffer_t * rb, size_t sz);
-EXPORT size_t jack_ringbuffer_write(jack_ringbuffer_t *rb, const char *src,
+LIB_EXPORT size_t jack_ringbuffer_read(jack_ringbuffer_t *rb, char *dest, size_t cnt);
+LIB_EXPORT size_t jack_ringbuffer_peek(jack_ringbuffer_t *rb, char *dest, size_t cnt);
+LIB_EXPORT void jack_ringbuffer_read_advance(jack_ringbuffer_t *rb, size_t cnt);
+LIB_EXPORT size_t jack_ringbuffer_read_space(const jack_ringbuffer_t *rb);
+LIB_EXPORT int jack_ringbuffer_mlock(jack_ringbuffer_t *rb);
+LIB_EXPORT void jack_ringbuffer_reset(jack_ringbuffer_t *rb);
+LIB_EXPORT void jack_ringbuffer_reset_size (jack_ringbuffer_t * rb, size_t sz);
+LIB_EXPORT size_t jack_ringbuffer_write(jack_ringbuffer_t *rb, const char *src,
                                  size_t cnt);
 void jack_ringbuffer_write_advance(jack_ringbuffer_t *rb, size_t cnt);
 size_t jack_ringbuffer_write_space(const jack_ringbuffer_t *rb);
@@ -64,7 +64,7 @@ size_t jack_ringbuffer_write_space(const jack_ringbuffer_t *rb);
 /* Create a new ringbuffer to hold at least `sz' bytes of data. The
    actual buffer size is rounded up to the next power of two.  */
 
-EXPORT jack_ringbuffer_t *
+LIB_EXPORT jack_ringbuffer_t *
 jack_ringbuffer_create (size_t sz)
 {
 	int power_of_two;
@@ -92,7 +92,7 @@ jack_ringbuffer_create (size_t sz)
 
 /* Free all data associated with the ringbuffer `rb'. */
 
-EXPORT void
+LIB_EXPORT void
 jack_ringbuffer_free (jack_ringbuffer_t * rb)
 {
 #ifdef USE_MLOCK
@@ -106,7 +106,7 @@ jack_ringbuffer_free (jack_ringbuffer_t * rb)
 
 /* Lock the data block of `rb' using the system call 'mlock'.  */
 
-EXPORT int
+LIB_EXPORT int
 jack_ringbuffer_mlock (jack_ringbuffer_t * rb)
 {
 #ifdef USE_MLOCK
@@ -121,7 +121,7 @@ jack_ringbuffer_mlock (jack_ringbuffer_t * rb)
 /* Reset the read and write pointers to zero. This is not thread
    safe. */
 
-EXPORT void
+LIB_EXPORT void
 jack_ringbuffer_reset (jack_ringbuffer_t * rb)
 {
 	rb->read_ptr = 0;
@@ -132,7 +132,7 @@ jack_ringbuffer_reset (jack_ringbuffer_t * rb)
 /* Reset the read and write pointers to zero. This is not thread
    safe. */
 
-EXPORT void
+LIB_EXPORT void
 jack_ringbuffer_reset_size (jack_ringbuffer_t * rb, size_t sz)
 {
     rb->size = sz;
@@ -146,7 +146,7 @@ jack_ringbuffer_reset_size (jack_ringbuffer_t * rb, size_t sz)
    number of bytes in front of the read pointer and behind the write
    pointer.  */
 
-EXPORT size_t
+LIB_EXPORT size_t
 jack_ringbuffer_read_space (const jack_ringbuffer_t * rb)
 {
 	size_t w, r;
@@ -165,7 +165,7 @@ jack_ringbuffer_read_space (const jack_ringbuffer_t * rb)
    number of bytes in front of the write pointer and behind the read
    pointer.  */
 
-EXPORT size_t
+LIB_EXPORT size_t
 jack_ringbuffer_write_space (const jack_ringbuffer_t * rb)
 {
 	size_t w, r;
@@ -185,7 +185,7 @@ jack_ringbuffer_write_space (const jack_ringbuffer_t * rb)
 /* The copying data reader.  Copy at most `cnt' bytes from `rb' to
    `dest'.  Returns the actual number of bytes copied. */
 
-EXPORT size_t
+LIB_EXPORT size_t
 jack_ringbuffer_read (jack_ringbuffer_t * rb, char *dest, size_t cnt)
 {
 	size_t free_cnt;
@@ -224,7 +224,7 @@ jack_ringbuffer_read (jack_ringbuffer_t * rb, char *dest, size_t cnt)
    `cnt' bytes from `rb' to `dest'.  Returns the actual number of bytes
    copied. */
 
-EXPORT size_t
+LIB_EXPORT size_t
 jack_ringbuffer_peek (jack_ringbuffer_t * rb, char *dest, size_t cnt)
 {
 	size_t free_cnt;
@@ -264,7 +264,7 @@ jack_ringbuffer_peek (jack_ringbuffer_t * rb, char *dest, size_t cnt)
 /* The copying data writer.  Copy at most `cnt' bytes to `rb' from
    `src'.  Returns the actual number of bytes copied. */
 
-EXPORT size_t
+LIB_EXPORT size_t
 jack_ringbuffer_write (jack_ringbuffer_t * rb, const char *src, size_t cnt)
 {
 	size_t free_cnt;
@@ -301,7 +301,7 @@ jack_ringbuffer_write (jack_ringbuffer_t * rb, const char *src, size_t cnt)
 
 /* Advance the read pointer `cnt' places. */
 
-EXPORT void
+LIB_EXPORT void
 jack_ringbuffer_read_advance (jack_ringbuffer_t * rb, size_t cnt)
 {
 	size_t tmp = (rb->read_ptr + cnt) & rb->size_mask;
@@ -310,7 +310,7 @@ jack_ringbuffer_read_advance (jack_ringbuffer_t * rb, size_t cnt)
 
 /* Advance the write pointer `cnt' places. */
 
-EXPORT void
+LIB_EXPORT void
 jack_ringbuffer_write_advance (jack_ringbuffer_t * rb, size_t cnt)
 {
 	size_t tmp = (rb->write_ptr + cnt) & rb->size_mask;
@@ -322,7 +322,7 @@ jack_ringbuffer_write_advance (jack_ringbuffer_t * rb, size_t cnt)
    the readable data is in one segment the second segment has zero
    length.  */
 
-EXPORT void
+LIB_EXPORT void
 jack_ringbuffer_get_read_vector (const jack_ringbuffer_t * rb,
 				 jack_ringbuffer_data_t * vec)
 {
@@ -366,7 +366,7 @@ jack_ringbuffer_get_read_vector (const jack_ringbuffer_t * rb,
    the writeable data is in one segment the second segment has zero
    length.  */
 
-EXPORT void
+LIB_EXPORT void
 jack_ringbuffer_get_write_vector (const jack_ringbuffer_t * rb,
 				  jack_ringbuffer_data_t * vec)
 {

macosx/JackCompilerDeps_os.h

@@ -38,15 +38,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
         #endif
     #endif
     #define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
-    #define EXPORT __attribute__((visibility("default")))
+    #define LIB_EXPORT __attribute__((visibility("default")))
     #ifdef SERVER_SIDE
         #define SERVER_EXPORT __attribute__((visibility("default")))
     #else
-        #define SERVER_EXPORT 
+        #define SERVER_EXPORT
     #endif
 #else
     #define MEM_ALIGN(x,y) x
-    #define EXPORT
+    #define LIB_EXPORT
     #define SERVER_EXPORT
     /* Add other things here for non-gcc platforms for POST_PACKED_STRUCTURE */
 #endif

posix/JackCompilerDeps_os.h

@@ -40,7 +40,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
         #endif
     #endif
     #define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
-    #define EXPORT __attribute__((visibility("default")))
+    #define LIB_EXPORT __attribute__((visibility("default")))
     #ifdef SERVER_SIDE
         #if (__GNUC__< 4)
             #define SERVER_EXPORT
@@ -52,7 +52,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     #endif
 #else
     #define MEM_ALIGN(x,y) x
-    #define EXPORT
+    #define LIB_EXPORT
     #define SERVER_EXPORT
     /* Add other things here for non-gcc platforms for POST_PACKED_STRUCTURE */
 #endif

windows/JackCompilerDeps_os.h

@@ -1,20 +1,20 @@
 /*
  Copyright (C) 2004-2008 Grame
- 
+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
  the Free Software Foundation; either version 2.1 of the License, or
  (at your option) any later version.
- 
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU Lesser General Public License for more details.
- 
+
  You should have received a copy of the GNU Lesser General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
+
  */
 
 
@@ -39,7 +39,7 @@
         #endif
     #endif
 	#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
-	#define	EXPORT __declspec(dllexport)
+	#define	LIB_EXPORT __declspec(dllexport)
     #ifdef SERVER_SIDE
         #define	SERVER_EXPORT __declspec(dllexport)
     #else
@@ -47,7 +47,7 @@
     #endif
 #else
 	#define MEM_ALIGN(x,y) x
-	#define	EXPORT __declspec(dllexport)
+	#define	LIB_EXPORT __declspec(dllexport)
     #ifdef SERVER_SIDE
         #define	SERVER_EXPORT __declspec(dllexport)
     #else