From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Mon, 19 Oct 2009 15:25:35 +0000 (-0700)
Subject: Merge branch 'osx_10.6_64_fixes' of http://gnuradio.org/git/michaelld
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=36a02055f0951e9f123445e1bd82a6d1eb030ac3;p=debian%2Fgnuradio

Merge branch 'osx_10.6_64_fixes' of http://gnuradio.org/git/michaelld

This merge adds support for OSX 10.6 in gr-audio-osx and usrp.

Conflicts:
	usrp/host/lib/usrp_prims_libusb0.cc
---

36a02055f0951e9f123445e1bd82a6d1eb030ac3
diff --cc usrp/host/lib/usrp_prims_libusb0.cc
index 0d685d84,0c8c3d1d..7053786d
--- a/usrp/host/lib/usrp_prims_libusb0.cc
+++ b/usrp/host/lib/usrp_prims_libusb0.cc
@@@ -69,7 -69,7 +69,8 @@@ _get_usb_string_descriptor (struct usb_
      fprintf (stderr, "usrp: usb_get_string_descriptor failed: %s\n",
               usb_strerror());
    }
 -  return (ret);
++
 +  return ret;
  }
  
  int