Changeset 332

Show
Ignore:
Timestamp:
05/02/08 17:23:38 (2 months ago)
Author:
hsattler
Message:

select WIN32 code on definition of HAVE_*_WINDOWS

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/bluez_compat.h

    r327 r332  
    2424#endif 
    2525 
    26 #ifdef _WIN32 
     26#if defined(HAVE_BLUETOOTH_WINDOWS) 
    2727/* you need the headers files from the Platform SDK */ 
    2828#include <winsock2.h> 
    …… 
    4040#define bacmp(a,b)     memcmp((a),(b),sizeof(BTH_ADDR)) 
    4141 
    42 #else /* _WIN32 */ 
    43 /* Linux/FreeBSD/NetBSD case */ 
    44  
    45 #if defined(HAVE_BLUETOOTH_LINUX) 
     42#elif defined(HAVE_BLUETOOTH_LINUX) 
    4643#include <bluetooth/bluetooth.h> 
    4744#include <bluetooth/rfcomm.h> 
    …… 
    6461 
    6562#endif /* HAVE_BLUETOOTH_* */ 
    66  
    67 #endif /* _WIN32 */ 

  • trunk/lib/irda_wrap.h

    r314 r332  
    22#define IRDA_WRAP_H 
    33 
    4 #ifdef _WIN32 
     4#if defined(HAVE_IRDA_WINDOWS) 
    55 
    66#ifndef _WIN32_WINNT 
    …… 
    1616#define sir_name   irdaServiceName 
    1717 
    18 #else /* _WIN32 */ 
     18#elif defined(HAVE_IRDA_LINUX) 
    1919 
    2020#include "irda.h" 
    2121 
    22 #endif /* _WIN32 */ 
     22#endif 
    2323 
    2424#endif /* IRDA_WRAP_H */