--- deliantra/server/include/plugin.h 2006/08/29 05:03:55 1.14 +++ deliantra/server/include/plugin.h 2006/12/11 19:46:46 1.15 @@ -13,20 +13,9 @@ /*****************************************************************************/ /* This one does not exist under Win32. */ /*****************************************************************************/ -#ifndef WIN32 #include -#endif -#undef MODULEAPI -#ifdef WIN32 -#ifdef PYTHON_PLUGIN_EXPORTS -#define MODULEAPI __declspec(dllexport) -#else -#define MODULEAPI __declspec(dllimport) -#endif -#else #define MODULEAPI -#endif #include #include @@ -41,9 +30,7 @@ /*****************************************************************************/ /* This one does not exist under Win32. */ /*****************************************************************************/ -#ifndef WIN32 #include -#endif #define NR_EVENTS 42 @@ -69,11 +56,7 @@ typedef int (*f_plug_postinit) (void); typedef int (*f_plug_init)(const char* iversion, f_plug_api gethooksptr); -#ifndef WIN32 #define LIBPTRTYPE void* -#else -#define LIBPTRTYPE HMODULE -#endif typedef struct _crossfire_plugin { @@ -91,19 +74,10 @@ extern int plugin_number; extern crossfire_plugin* plugins_list; -#ifdef WIN32 - -#define plugins_dlopen(fname) LoadLibrary(fname) -#define plugins_dlclose(lib) FreeLibrary(lib) -#define plugins_dlsym(lib,name) GetProcAddress(lib,name) - -#else /*WIN32 */ - #define plugins_dlopen(fname) dlopen(fname,RTLD_NOW|RTLD_GLOBAL) #define plugins_dlclose(lib) dlclose(lib) #define plugins_dlsym(lib,name) dlsym(lib,name) #define plugins_dlerror() dlerror() -#endif /* WIN32 */ /* OBJECT-RELATED HOOKS */