diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-05-24 00:05:54 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-05-24 00:05:54 +0000 |
| commit | 7367822bd9e67ef1e5e888f3302ded507ab4e68a (patch) | |
| tree | b58c71bf4068bdc60b395e24af54bd03a506dbad /pdp_freeframe/FreeFrame.h | |
| parent | a6e6fcac6028fda93c43bcd6e3628e1e4f51499c (diff) | |
store plugindir as symbol in object's struct and use that with [plugindir( message; ported to Mac OS X
svn path=/trunk/externals/pdvjtools/; revision=9883
Diffstat (limited to 'pdp_freeframe/FreeFrame.h')
| -rw-r--r-- | pdp_freeframe/FreeFrame.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pdp_freeframe/FreeFrame.h b/pdp_freeframe/FreeFrame.h index 7ca7f75..c63d698 100644 --- a/pdp_freeframe/FreeFrame.h +++ b/pdp_freeframe/FreeFrame.h @@ -51,7 +51,7 @@ extern "C" { * includes */ -#ifdef WIN32 +#ifdef _WIN32 #if _MSC_VER > 1000 #pragma once @@ -60,17 +60,12 @@ extern "C" { #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> -#elif defined LINUX +#elif defined(__linux__) || defined(__APPLE__) typedef unsigned int DWORD; typedef void *LPVOID; typedef unsigned char BYTE; -#elif defined MACOS - -typedef unsigned int DWORD; -typedef unsigned char BYTE; - #endif @@ -207,7 +202,7 @@ typedef plugMainUnion plugMainType(DWORD, LPVOID, DWORD); * */ -#ifdef WIN32 +#ifdef _WIN32 BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, DWORD lpReserved ); @@ -215,12 +210,12 @@ __declspec(dllexport) LPVOID __stdcall plugMain(DWORD functionCode, LPVOID pPara typedef __declspec(dllimport) LPVOID (__stdcall *FF_Main_FuncPtr)(DWORD, LPVOID, DWORD); -#elif LINUX +#elif __linux__ plugMainUnion plugMain(DWORD functionCode, LPVOID pParam, DWORD reserved); -#elif MACOS +#elif __APPLE__ typedef LPVOID (*FF_Main_FuncPtr)(DWORD, LPVOID, DWORD); |