git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2918 0c269be4-1314-0410-8aa9-9f06e86f4224tags/1.90
@@ -23,15 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||||
#endif | #endif | ||||
#include "JackSystemDeps.h" | #include "JackSystemDeps.h" | ||||
/* | |||||
#ifndef WIN32 | |||||
#ifndef ADDON_DIR | |||||
#include "config.h" | |||||
#endif | |||||
#endif | |||||
*/ | |||||
#include "JackDriverLoader.h" | #include "JackDriverLoader.h" | ||||
#include "JackConstants.h" | #include "JackConstants.h" | ||||
#include "JackError.h" | #include "JackError.h" | ||||
@@ -24,25 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||||
#include "driver_interface.h" | #include "driver_interface.h" | ||||
#include "JackControlAPI.h" | #include "JackControlAPI.h" | ||||
#include "JackPlatformPlug.h" | #include "JackPlatformPlug.h" | ||||
#ifdef WIN32 | |||||
#include <windows.h> | |||||
#define DRIVER_HANDLE HINSTANCE | |||||
#define LoadDriverModule(name) LoadLibrary((name)) | |||||
#define UnloadDriverModule(handle) (FreeLibrary(((HMODULE)handle))) | |||||
#define GetProc(handle, name) GetProcAddress(((HMODULE)handle),(name)) | |||||
#else | |||||
#include <dlfcn.h> | |||||
#define DRIVER_HANDLE void* | |||||
#define LoadDriverModule(name) dlopen((name), RTLD_NOW | RTLD_GLOBAL) | |||||
#define UnloadDriverModule(handle) dlclose((handle)) | |||||
#define GetProc(handle, name) dlsym((handle), (name)) | |||||
#endif | |||||
#include "JackSystemDeps.h" | |||||
namespace Jack | namespace Jack | ||||
{ | { | ||||
@@ -23,5 +23,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||||
#include <inttypes.h> | #include <inttypes.h> | ||||
#include <sys/types.h> | #include <sys/types.h> | ||||
#include <signal.h> | #include <signal.h> | ||||
#include <dlfcn.h> | |||||
#define DRIVER_HANDLE void* | |||||
#define LoadDriverModule(name) dlopen((name), RTLD_NOW | RTLD_GLOBAL) | |||||
#define UnloadDriverModule(handle) dlclose((handle)) | |||||
#define GetProc(handle, name) dlsym((handle), (name)) | |||||
#endif | #endif |
@@ -22,6 +22,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||||
#include <windows.h> | #include <windows.h> | ||||
#define DRIVER_HANDLE HINSTANCE | |||||
#define LoadDriverModule(name) LoadLibrary((name)) | |||||
#define UnloadDriverModule(handle) (FreeLibrary(((HMODULE)handle))) | |||||
#define GetProc(handle, name) GetProcAddress(((HMODULE)handle),(name)) | |||||
#pragma warning (disable : 4786) | #pragma warning (disable : 4786) | ||||
#define ENOBUFS 55 | #define ENOBUFS 55 | ||||