diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-24 15:53:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-24 15:53:03 -0700 |
| commit | 192663bcc919a794a24eabb38d12519f445b7a47 (patch) | |
| tree | ba55269010c4484bef12d4019c691d9e469165d7 /host/lib/transport/libusb1_base.hpp | |
| parent | 77cdb4a9695e71e64e1d87cfad2cb4d8717f971e (diff) | |
| parent | 5d6d25b49cc783ef012410064bc9eb0e66e50227 (diff) | |
| download | uhd-192663bcc919a794a24eabb38d12519f445b7a47.tar.gz uhd-192663bcc919a794a24eabb38d12519f445b7a47.tar.bz2 uhd-192663bcc919a794a24eabb38d12519f445b7a47.zip | |
Merge branch 'master' into usrp_e
Conflicts:
host/CMakeLists.txt
Diffstat (limited to 'host/lib/transport/libusb1_base.hpp')
| -rw-r--r-- | host/lib/transport/libusb1_base.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/transport/libusb1_base.hpp b/host/lib/transport/libusb1_base.hpp index abe5e22a2..484bcf3d9 100644 --- a/host/lib/transport/libusb1_base.hpp +++ b/host/lib/transport/libusb1_base.hpp @@ -15,8 +15,8 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#ifndef INCLUDED_TRANSPORT_LIBUSB_HPP -#define INCLUDED_TRANSPORT_LIBUSB_HPP +#ifndef INCLUDED_LIBUHD_TRANSPORT_LIBUSB_HPP +#define INCLUDED_LIBUHD_TRANSPORT_LIBUSB_HPP #include <uhd/config.hpp> #include <uhd/transport/usb_device_handle.hpp> @@ -91,4 +91,4 @@ namespace libusb { }} //namespace -#endif /* INCLUDED_TRANSPORT_LIBUSB_HPP */ +#endif /* INCLUDED_LIBUHD_TRANSPORT_LIBUSB_HPP */ |