gnokii/common/devices Makefile, 1.11, 1.12 bluetooth.c, 1.1, 1.2 osxbluetooth.c, 1.1, 1.2 unixbluetooth.c, 1.11, 1.12

[BORBELY Zoltan <address@hidden>]

Update of /cvsroot/gnokii/gnokii/common/devices
In directory subversions:/tmp/cvs-serv28889/common/devices

Modified Files:
        Makefile bluetooth.c osxbluetooth.c unixbluetooth.c 
Log Message:
Mac OSX bluetooth fixes


Index: osxbluetooth.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/devices/osxbluetooth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osxbluetooth.c      20 Nov 2003 21:10:34 -0000      1.1
--- osxbluetooth.c      2 Dec 2003 21:48:05 -0000       1.2
***************
*** 28,32 ****
--- 28,40 ----
  */
  
+ #include "config.h"
+ 
+ #ifdef HAVE_BLUETOOTH_MACOSX
+ 
+ #include "compat.h"
  #include "devices/osxbluetooth.h"
+ #include "misc.h"
+ #include "gnokii.h"
+ #include "devices/unixbluetooth.h"
  
  /* ----- bluetooth io thread ----- */
***************
*** 210,211 ****
--- 218,221 ----
        return nRetVal;
  }
+ 
+ #endif        /* HAVE_BLUETOOTH_MACOSX */

Index: bluetooth.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/devices/bluetooth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bluetooth.c 20 Nov 2003 21:10:34 -0000      1.1
--- bluetooth.c 2 Dec 2003 21:48:05 -0000       1.2
***************
*** 32,40 ****
  #include "misc.h"
  #include "gnokii.h"
  
  #ifdef HAVE_BLUETOOTH
  
! #include "devices/unixbluetooth.h"
! 
  static char *phone[] = {
        "Nokia 3650",
--- 32,40 ----
  #include "misc.h"
  #include "gnokii.h"
+ #include "devices/unixbluetooth.h"
  
  #ifdef HAVE_BLUETOOTH
  
! #if 0
  static char *phone[] = {
        "Nokia 3650",
***************
*** 45,53 ****
        "Nokia 8910"
  };
- 
- #ifdef HAVE_BLUETOOTH_MACOSX
- #  include "osxbluetooth.c"
- #else
- #  include "unixbluetooth.c"
  #endif
  
--- 45,48 ----

Index: Makefile
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/devices/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile    20 Nov 2003 21:10:34 -0000      1.11
--- Makefile    2 Dec 2003 21:48:05 -0000       1.12
***************
*** 20,24 ****
  OBJS =        tekram.o \
        unixirda.o \
!       bluetooth.o
  
  ifdef WIN32
--- 20,26 ----
  OBJS =        tekram.o \
        unixirda.o \
!       bluetooth.o \
!       unixbluetooth.o \
!       osxbluetooth.o
  
  ifdef WIN32

Index: unixbluetooth.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/devices/unixbluetooth.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** unixbluetooth.c     22 Nov 2003 15:37:46 -0000      1.11
--- unixbluetooth.c     2 Dec 2003 21:48:05 -0000       1.12
***************
*** 28,31 ****
--- 28,39 ----
  */
  
+ #include "config.h"
+ #include "compat.h"
+ #include "misc.h"
+ #include "gnokii.h"
+ #include "devices/unixbluetooth.h"
+ 
+ #if defined(HAVE_BLUETOOTH_BLUEZ) || defined(HAVE_BLUETOOTH_NETGRAPH)
+ 
  #include <stdlib.h>
  #include <unistd.h>
***************
*** 73,77 ****
  }
  
! #endif
  
  static int str2ba(const char *str, bdaddr_t *ba)
--- 81,85 ----
  }
  
! #endif        /* HAVE_BT_ATON */
  
  static int str2ba(const char *str, bdaddr_t *ba)
***************
*** 150,151 ****
--- 158,161 ----
        return select(fd + 1, &readfds, NULL, NULL, timeout);
  }
+ 
+ #endif        /* HAVE_BLUETOOTH_BLUEZ || HAVE_BLUETOOTH_NETGRAPH */