John Emmas Cygwin cleanup patch.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4582 0c269be4-1314-0410-8aa9-9f06e86f4224
This commit is contained in:
parent
846349182a
commit
f58e9abb51
|
@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(__CYGWIN__) && !defined(CYGWIN_USE_PIPES)
|
|
||||||
#undef WIN32 // Avoids "unqualified id" problem with std::max() etc
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "JackDebugClient.h"
|
#include "JackDebugClient.h"
|
||||||
#include "JackEngineControl.h"
|
#include "JackEngineControl.h"
|
||||||
#include "JackException.h"
|
#include "JackException.h"
|
||||||
|
|
|
@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if !defined(WIN32) || defined(__CYGWIN__)
|
|
||||||
|
|
||||||
#include "JackConstants.h"
|
#include "JackConstants.h"
|
||||||
#include "JackChannel.h"
|
#include "JackChannel.h"
|
||||||
#include "JackLibGlobals.h"
|
#include "JackLibGlobals.h"
|
||||||
|
@ -118,13 +116,8 @@ static void start_server_classic_aux(const char* server_name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!good) {
|
if (!good) {
|
||||||
#if defined(__CYGWIN__)
|
command = (char*)(JACK_LOCATION "/jackd");
|
||||||
command = (char*)("/usr/bin/jackd.exe");
|
strncpy(arguments, JACK_LOCATION "/jackd -T -d "JACK_DEFAULT_DRIVER, 255);
|
||||||
strncpy(arguments, "jackd.exe -S -R -d JACK_DEFAULT_DRIVER", 255);
|
|
||||||
#else
|
|
||||||
command = (char*)("/usr/bin/jackd");
|
|
||||||
strncpy(arguments, "/jackd -R -d "JACK_DEFAULT_DRIVER, 255);
|
|
||||||
#endif
|
|
||||||
} else {
|
} else {
|
||||||
result = strcspn(arguments, " ");
|
result = strcspn(arguments, " ");
|
||||||
command = (char*)malloc(result + 1);
|
command = (char*)malloc(result + 1);
|
||||||
|
@ -246,4 +239,3 @@ int try_start_server(jack_varargs_t* va, jack_options_t options, jack_status_t*
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // !WIN32 || __CYGWIN__
|
|
||||||
|
|
|
@ -21,59 +21,32 @@
|
||||||
#ifndef __JackSystemDeps_WIN32__
|
#ifndef __JackSystemDeps_WIN32__
|
||||||
#define __JackSystemDeps_WIN32__
|
#define __JackSystemDeps_WIN32__
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
|
|
||||||
#ifndef PATH_MAX
|
#ifndef PATH_MAX
|
||||||
#define PATH_MAX 512
|
#define PATH_MAX 512
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__CYGWIN__)
|
#define UINT32_MAX 4294967295U
|
||||||
|
|
||||||
#include <inttypes.h>
|
#define DRIVER_HANDLE HINSTANCE
|
||||||
#include <sys/types.h>
|
#define LoadDriverModule(name) LoadLibrary((name))
|
||||||
#include <signal.h>
|
#define UnloadDriverModule(handle) (FreeLibrary(((HMODULE)handle)))
|
||||||
#include <dlfcn.h>
|
#define GetDriverProc(handle, name) GetProcAddress(((HMODULE)handle), (name))
|
||||||
|
|
||||||
#ifndef UINT32_MAX
|
#define JACK_HANDLE HINSTANCE
|
||||||
#define UINT32_MAX 4294967295U
|
#define LoadJackModule(name) LoadLibrary((name));
|
||||||
#endif
|
#define UnloadJackModule(handle) FreeLibrary((handle));
|
||||||
|
#define GetJackProc(handle, name) GetProcAddress((handle), (name));
|
||||||
|
|
||||||
#define DRIVER_HANDLE void*
|
#ifndef ENOBUFS
|
||||||
#define LoadDriverModule(name) dlopen((name), RTLD_NOW | RTLD_GLOBAL)
|
#define ENOBUFS 55
|
||||||
#define UnloadDriverModule(handle) dlclose((handle))
|
#endif
|
||||||
#define GetDriverProc(handle, name) dlsym((handle), (name))
|
|
||||||
|
|
||||||
#define JACK_HANDLE void*
|
|
||||||
#define LoadJackModule(name) dlopen((name), RTLD_NOW | RTLD_LOCAL);
|
|
||||||
#define UnloadJackModule(handle) dlclose((handle));
|
|
||||||
#define GetJackProc(handle, name) dlsym((handle), (name));
|
|
||||||
|
|
||||||
#define JACK_DEBUG (getenv("JACK_CLIENT_DEBUG") && strcmp(getenv("JACK_CLIENT_DEBUG"), "on") == 0)
|
|
||||||
|
|
||||||
|
#ifdef _DEBUG
|
||||||
|
#define JACK_DEBUG true
|
||||||
#else
|
#else
|
||||||
|
#define JACK_DEBUG false
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
#define UINT32_MAX 4294967295U
|
|
||||||
|
|
||||||
#define DRIVER_HANDLE HINSTANCE
|
|
||||||
#define LoadDriverModule(name) LoadLibrary((name))
|
|
||||||
#define UnloadDriverModule(handle) (FreeLibrary(((HMODULE)handle)))
|
|
||||||
#define GetDriverProc(handle, name) GetProcAddress(((HMODULE)handle), (name))
|
|
||||||
|
|
||||||
#define JACK_HANDLE HINSTANCE
|
|
||||||
#define LoadJackModule(name) LoadLibrary((name));
|
|
||||||
#define UnloadJackModule(handle) FreeLibrary((handle));
|
|
||||||
#define GetJackProc(handle, name) GetProcAddress((handle), (name));
|
|
||||||
|
|
||||||
#ifndef ENOBUFS
|
|
||||||
#define ENOBUFS 55
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _DEBUG
|
|
||||||
#define JACK_DEBUG true
|
|
||||||
#else
|
|
||||||
#define JACK_DEBUG false
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
using namespace Jack;
|
using namespace Jack;
|
||||||
|
|
||||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
|
||||||
|
|
||||||
#include <shlobj.h>
|
#include <shlobj.h>
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -308,5 +306,3 @@ int try_start_server(jack_varargs_t* va, jack_options_t options, jack_status_t*
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // WIN32 && !__CYGWIN__
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue