Ticket #9: 610_win32_irda.patch

openobex-anoncvs

@@ -53 +53 @@
         AC_SUBST(EXTRA_LIBS)
 ])
 
-AC_DEFUN([AC_PATH_IRDA], [
+AC_DEFUN([AC_PATH_IRDA_LINUX], [
         AC_CACHE_CHECK([for IrDA support], irda_found, [
                 AC_TRY_COMPILE([
                                 #include <sys/socket.h>
@@ -64 +64 @@
         ])
 ])
 
+AC_DEFUN([AC_PATH_IRDA_WIN32], [
+        AC_CACHE_VAL(irda_found, [
+                AC_CHECK_HEADERS(af_irda.h, irda_found=yes, irda_found=no,
+                                 [
+                                  #include <winsock2.h>
+                ])
+        ])
+        AC_MSG_CHECKING([for IrDA support])
+        AC_MSG_RESULT([$irda_found])
+])
+
+AC_DEFUN([AC_PATH_IRDA], [
+        case $host in
+        *-*-linux*)
+                AC_PATH_IRDA_LINUX
+                ;;
+        *-*-mingw32*)
+                AC_PATH_IRDA_WIN32
+                ;;
+        *)
+                irda_found=no;
+                AC_MSG_CHECKING([for IrDA support])
+                AC_MSG_RESULT([$irda_found])
+                ;;
+        esac
+])
+
 AC_DEFUN([AC_PATH_WINBT], [
         AC_CACHE_VAL(winbt_found,[
                AC_CHECK_HEADERS(ws2bth.h, winbt_found=yes, winbt_found=no,

lib/irda_wrap.h

@@ -2 +2 @@
 #define IRDA_WRAP_H
 
 #ifdef _WIN32
-#define _WIN32_WINNT
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 1
+#endif
 
 #include <af_irda.h>
-struct irda_device_list {DEVICELIST;};
-struct irda_device_info {IRDA_DEVICE_INFO;};
-struct sockaddr_irda {SOCKADDR_IRDA;};
-#define sir_name irdaServiceName
+#define irda_device_info _WINDOWS_IRDA_DEVICE_INFO
+#define irda_device_list _WINDOWS_DEVICELIST
+
+#define sockaddr_irda _SOCKADDR_IRDA
 #define sir_family irdaAddressFamily
+#define sir_name   irdaServiceName
 
 #else /* _WIN32 */