Changeset 4945:9c4f8c8d92a9 in roaraudio


Ignore:
Timestamp:
05/09/11 10:36:13 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

small fixes for win32 build

Location:
libroar
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libroar/basic.c

    r4873 r4945  
    6060 struct roar_x11_connection * x11con; 
    6161#endif 
     62#ifdef ROAR_HAVE_LIBSLP 
    6263 struct roar_server * list; 
    6364 int workarounds_store; 
     65#endif 
    6466 
    6567 roar_err_set(ROAR_ERROR_UNKNOWN); 
  • libroar/libroar.c

    r4923 r4945  
    4343int roar_mm_mlock(const void *addr, size_t len) { 
    4444#if defined(ROAR_TARGET_WIN32) 
    45  return GlobalLock(addr) == addr ? 0 : -1; 
     45 /* GlobalLock() generates errors. Maybe we do not use correctly. 
     46  * We just ignore that at the moment and throw NOSYS. 
     47  * 
     48  * return GlobalLock(addr) == addr ? 0 : -1; 
     49  */ 
     50 roar_err_set(ROAR_ERROR_NOSYS); 
     51 return -1; 
    4652#elif defined(ROAR_TARGET_MICROCONTROLLER) 
    4753 return 0; 
     
    5662 return mlock((void*)pos, len); 
    5763#else 
     64 roar_err_set(ROAR_ERROR_NOSYS); 
    5865 return -1; 
    5966#endif 
     
    6673 // TODO: find out what do do here. GlobalUnLock()? does such a function exist? 
    6774// return GlobalLock(addr) == addr ? 0 : -1; 
     75 roar_err_set(ROAR_ERROR_NOSYS); 
    6876 return -1; 
    6977#elif defined(ROAR_TARGET_MICROCONTROLLER) 
     
    7987 return munlock((void*)pos, len); 
    8088#else 
     89 roar_err_set(ROAR_ERROR_NOSYS); 
    8190 return -1; 
    8291#endif 
Note: See TracChangeset for help on using the changeset viewer.