diff --git a/openhantek/src/hantek/usb/ezusb.cpp b/openhantek/src/hantek/usb/ezusb.cpp index 9c95d75..e5a0361 100644 --- a/openhantek/src/hantek/usb/ezusb.cpp +++ b/openhantek/src/hantek/usb/ezusb.cpp @@ -44,7 +44,7 @@ * some can be set up with external memory when device costs allow. * Note that the design was originally by AnchorChips, so you may find * references to that vendor (which was later merged into Cypress). - * The Cypress FX parts are largely compatible with the Anchorhip ones. + * The Cypress FX parts are largely compatible with the Anchorchip ones. */ int verbose = 1; diff --git a/openhantek/src/hantek/usb/ezusb.h b/openhantek/src/hantek/usb/ezusb.h index b0d55e5..c954cd2 100644 --- a/openhantek/src/hantek/usb/ezusb.h +++ b/openhantek/src/hantek/usb/ezusb.h @@ -1,5 +1,4 @@ -#ifndef __ezusb_H -#define __ezusb_H +#pragma once /* * Copyright © 2001 Stephen Williams (steve@icarus.com) * Copyright © 2002 David Brownell (dbrownell@users.sourceforge.net) @@ -20,23 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#if !defined(_MSC_VER) -#include -#else -#define __attribute__(x) -#if !defined(bool) -#define bool int -#endif -#if !defined(true) -#define true(1 == 1) -#endif -#if !defined(false) -#define false(!true) -#endif -#if defined(_PREFAST_) -#pragma warning(disable : 28193) -#endif -#endif + +#include + +struct libusb_device_handle; #define FX_TYPE_UNDEFINED -1 #define FX_TYPE_AN21 0 /* Original AnchorChips parts */ @@ -109,5 +95,3 @@ extern int ezusb_load_eeprom(libusb_device_handle *device, const char *path, int /* Verbosity level (default 1). Can be increased or decreased with options v/q */ extern int verbose; - -#endif