Changeset 200 for trunk

Timestamp:

10/16/07 00:35:15 (2 years ago)

Author:

zany

Message:

win32 needs this

Location:

trunk

Files:

• apps/obexftp.c (modified) (1 diff)
• m4/lib-ld.m4 (added)
• m4/lib-link.m4 (added)
• m4/lib-prefix.m4 (added)
• obexftp/bt_kit.c (modified) (5 diffs)
• obexftp/bt_kit.h (modified) (1 diff)

trunk/apps/obexftp.c

@@ -34 +34 @@
 #include <obexftp/uuid.h>
 
-#ifdef _WIN32_FIXME
-/* OpenOBEX won't define a handler on win32 */
-void DEBUG(unsigned int n, ...) { }
-void DUMPBUFFER(unsigned int n, char *label, char *msg) { }
-#endif /* _WIN32 */
-
 #ifdef _WIN32
 #define strcasestr strstr
+#define ETIMEDOUT       WSAETIMEDOUT
+#define ECONNREFUSED    WSAECONNREFUSED
+#define EHOSTDOWN       WSAEHOSTDOWN
+#define EINPROGRESS     WSAEINPROGRESS
 #endif /* _WIN32 */
 

trunk/obexftp/bt_kit.c

@@ -28 +28 @@
 #include <unistd.h>
 
+#ifndef _WIN32
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#endif /* _WIN32 */
 
 #include "bt_kit.h"
@@ -37 +39 @@
  
 #ifdef HAVE_BLUETOOTH
-#ifdef HAVE_SDPLIB /* should switch on OS here */
-
-/**
-        Nokia OBEX PC Suite Services.
-        binary representation of 00005005-0000-1000-8000-0002ee000001
-        \note prefer this over FTP on Series 60 devices
- */
-#define __SVC_UUID_PCSUITE_bytes \
-{ 0x00, 0x00, 0x50, 0x05, \
-  0x00, 0x00, 0x10, 0x00, 0x80, 0x00, \
-  0x00, 0x02, 0xee, 0x00, 0x00, 0x01 }
-#define SVC_UUID_PCSUITE ((const uint8_t []) __SVC_UUID_PCSUITE_bytes)
 
 #ifdef _WIN32
@@ -71 +61 @@
         return 0;
 }
-#endif
+#endif /* _WIN32 */
+
+#ifdef HAVE_SDPLIB /* should switch on OS here */
+
+/**
+        Nokia OBEX PC Suite Services.
+        binary representation of 00005005-0000-1000-8000-0002ee000001
+        \note prefer this over FTP on Series 60 devices
+ */
+#define __SVC_UUID_PCSUITE_bytes \
+{ 0x00, 0x00, 0x50, 0x05, \
+  0x00, 0x00, 0x10, 0x00, 0x80, 0x00, \
+  0x00, 0x02, 0xee, 0x00, 0x00, 0x01 }
+#define SVC_UUID_PCSUITE ((const uint8_t []) __SVC_UUID_PCSUITE_bytes)
 
 
@@ -420 +423 @@
 
 #else
-#warning "no bluetooth support for this platform"
+#warning "no bluetooth sdp support for this platform"
 
 char **btkit_discover(const char *UNUSED(src))
@@ -443 +446 @@
 int btkit_unregister_service(int UNUSED(svclass))
 {
+        return -1;
 }
 

trunk/obexftp/bt_kit.h

@@ -42 +42 @@
 //#include <Bthsdpdef.h>
 //#include <BluetoothAPIs.h>
-#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
+#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
+#define ETIMEDOUT       WSAETIMEDOUT
+#define ECONNREFUSED    WSAECONNREFUSED
+#define EHOSTDOWN       WSAEHOSTDOWN
+#define EINPROGRESS     WSAEINPROGRESS
 #define bdaddr_t        BTH_ADDR
 #define sockaddr_rc     _SOCKADDR_BTH