diff -r d2fc5d5f8a36 -r ebf4bd44f282 drivers/unix/unix.c --- a/drivers/unix/unix.c Sat Apr 07 09:49:05 2007 +0200 +++ b/drivers/unix/unix.c Wed Apr 11 07:50:34 2007 +0200 @@ -27,16 +27,6 @@ #define DLL_CALL(funcname) (* funcname##_driver) #define FCT_PTR_INIT =NULL -#ifdef WIN32 -#define DLSYM(name)\ - *(void **) (&_##name) = GetProcAddress(handle, TEXT(#name"_driver"));\ - if (name##_driver == NULL) {\ - fprintf (stderr, "Error loading symbol %s\n",#name"_driver");\ - UnLoadCanDriver(handle);\ - return NULL;\ - } - -#else #define DLSYM(name)\ *(void **) (&name##_driver) = dlsym(handle, #name"_driver");\ if ((error = dlerror()) != NULL) {\ @@ -44,7 +34,6 @@ UnLoadCanDriver(handle);\ return NULL;\ } -#endif #else /*NOT_USE_DYNAMIC_LOADING*/ @@ -83,11 +72,8 @@ { if(handle!=NULL) { -#ifdef WIN32 - FreeLibrary(handle); -#else dlclose(handle); -#endif + handle=NULL; return 0; } @@ -100,21 +86,9 @@ LIB_HANDLE handle = NULL; char *error; -#ifdef WIN32 if(handle==NULL) { - handle = LoadLibrary(driver_name); - } - - if (handle == NULL) { - fprintf(stderr,"Error loading Can Driver dll \n"); - return -1; - } - -#else - if(handle==NULL) - { handle = dlopen(driver_name, RTLD_LAZY); } @@ -122,7 +96,6 @@ fprintf (stderr, "%s\n", dlerror()); return NULL; } -#endif /*Get function ptr*/ DLSYM(canReceive)