Revert "Correct export issues."

This reverts commit 8ba6f04562.

jack_info() for example is not part of the JACK API. So it must not be
global/external symbol in libjack, only in libjackserver.

kluppe defines an object called jack_info:
common/jackmixer.c: jack_info_t   *jack_info;

Conflicts:

	common/JackDriverLoader.cpp
	common/JackError.h

common/JackDriverLoader.cpp

@@ -32,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 jack_driver_desc_t * jackctl_driver_get_desc(jackctl_driver_t * driver);
 
-EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file)
+SERVER_EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file)
 {
     unsigned long i;
     char arg_default[JACK_DRIVER_PARAM_STRING_MAX + 1];
@@ -75,7 +75,7 @@ jack_print_driver_param_usage (jack_driver_desc_t * desc, unsigned long param, F
     fprintf (file, "%s\n", desc->params[param].long_desc);
 }
 
-EXPORT void jack_free_driver_params(JSList * driver_params)
+SERVER_EXPORT void jack_free_driver_params(JSList * driver_params)
 {
     JSList *node_ptr = driver_params;
     JSList *next_node_ptr;
@@ -228,7 +228,7 @@ jack_parse_driver_params(jack_driver_desc_t * desc, int argc, char* argv[], JSLi
     return 0;
 }
 
-EXPORT int
+SERVER_EXPORT int
 jackctl_parse_driver_params(jackctl_driver *driver_ptr, int argc, char* argv[])
 {
     struct option * long_options;

common/JackDriverLoader.h

@@ -59,9 +59,9 @@ jack_driver_desc_t * jack_find_driver_descriptor(JSList * drivers, const char *
 JSList * jack_drivers_load(JSList * drivers);
 JSList * jack_internals_load(JSList * internals);
 
-EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]);
-EXPORT void jack_free_driver_params(JSList * param_ptr);
-EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file);
+SERVER_EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]);
+SERVER_EXPORT void jack_free_driver_params(JSList * param_ptr);
+SERVER_EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file);
 
 #endif
 

common/JackError.cpp

@@ -33,7 +33,7 @@ static bool change_thread_log_function(jack_log_function_t log_function)
             && jack_tls_set(JackGlobals::fKeyLogFunction, (void*)log_function));
 }
 
-EXPORT int set_threaded_log_function()
+SERVER_EXPORT int set_threaded_log_function()
 {
     return change_thread_log_function(JackMessageBufferAdd);
 }
@@ -88,7 +88,7 @@ static void jack_format_and_log(int level, const char *prefix, const char *fmt,
     log_function(level, buffer);
 }
 
-EXPORT void jack_error(const char *fmt, ...)
+SERVER_EXPORT void jack_error(const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -96,7 +96,7 @@ EXPORT void jack_error(const char *fmt, ...)
 	va_end(ap);
 }
 
-EXPORT void jack_info(const char *fmt, ...)
+SERVER_EXPORT void jack_info(const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -104,7 +104,7 @@ EXPORT void jack_info(const char *fmt, ...)
 	va_end(ap);
 }
 
-EXPORT void jack_log(const char *fmt,...)
+SERVER_EXPORT void jack_log(const char *fmt,...)
 {
 	if (JackGlobals::fVerbose) {
 		va_list ap;
@@ -114,23 +114,23 @@ EXPORT void jack_log(const char *fmt,...)
 	}
 }
 
-EXPORT void default_jack_error_callback(const char *desc)
+SERVER_EXPORT void default_jack_error_callback(const char *desc)
 {
     fprintf(stderr, "%s\n", desc);
     fflush(stderr);
 }
 
-EXPORT void default_jack_info_callback(const char *desc)
+SERVER_EXPORT void default_jack_info_callback(const char *desc)
 {
     fprintf(stdout, "%s\n", desc);
     fflush(stdout);
 }
 
-EXPORT void silent_jack_error_callback(const char *desc)
+SERVER_EXPORT void silent_jack_error_callback(const char *desc)
 {}
 
-EXPORT void silent_jack_info_callback(const char *desc)
+SERVER_EXPORT void silent_jack_info_callback(const char *desc)
 {}
 
-EXPORT void (*jack_error_callback)(const char *desc) = &default_jack_error_callback;
-EXPORT void (*jack_info_callback)(const char *desc) = &default_jack_info_callback;
+SERVER_EXPORT void (*jack_error_callback)(const char *desc) = &default_jack_error_callback;
+SERVER_EXPORT void (*jack_info_callback)(const char *desc) = &default_jack_info_callback;

common/JackError.h

@@ -34,27 +34,27 @@ extern "C"
 #define LOG_LEVEL_INFO   1
 #define LOG_LEVEL_ERROR  2
 
-    EXPORT void jack_error(const char *fmt, ...);
+    SERVER_EXPORT void jack_error(const char *fmt, ...);
 
-    EXPORT void jack_info(const char *fmt, ...);
+    SERVER_EXPORT void jack_info(const char *fmt, ...);
 
     // like jack_info() but only if verbose mode is enabled
-    EXPORT void jack_log(const char *fmt, ...);
+    SERVER_EXPORT void jack_log(const char *fmt, ...);
 
-    EXPORT extern void (*jack_error_callback)(const char *desc);
-    EXPORT extern void (*jack_info_callback)(const char *desc);
+    SERVER_EXPORT extern void (*jack_error_callback)(const char *desc);
+    SERVER_EXPORT extern void (*jack_info_callback)(const char *desc);
 
-    EXPORT extern void default_jack_error_callback(const char *desc);
-    EXPORT extern void default_jack_info_callback(const char *desc);
+    SERVER_EXPORT extern void default_jack_error_callback(const char *desc);
+    SERVER_EXPORT extern void default_jack_info_callback(const char *desc);
 
-    EXPORT extern void silent_jack_error_callback(const char *desc);
-    EXPORT extern void silent_jack_info_callback(const char *desc);
+    SERVER_EXPORT extern void silent_jack_error_callback(const char *desc);
+    SERVER_EXPORT extern void silent_jack_info_callback(const char *desc);
 
     typedef void (* jack_log_function_t)(int level, const char *message);
 
     void jack_log_function(int level, const char *message);
 
-    EXPORT int set_threaded_log_function();
+    SERVER_EXPORT int set_threaded_log_function();
 
 #ifdef __cplusplus
 }