Commit fa0087aeb0970e5483f507418019a033e58c1fa3

Authored by David Graeff
1 parent cc3c632a

ezusb: Remove c-only parts like defining booleans. This otherwise breaks the windows build

openhantek/src/hantek/usb/ezusb.cpp
... ... @@ -44,7 +44,7 @@
44 44 * some can be set up with external memory when device costs allow.
45 45 * Note that the design was originally by AnchorChips, so you may find
46 46 * references to that vendor (which was later merged into Cypress).
47   - * The Cypress FX parts are largely compatible with the Anchorhip ones.
  47 + * The Cypress FX parts are largely compatible with the Anchorchip ones.
48 48 */
49 49  
50 50 int verbose = 1;
... ...
openhantek/src/hantek/usb/ezusb.h
1   -#ifndef __ezusb_H
2   -#define __ezusb_H
  1 +#pragma once
3 2 /*
4 3 * Copyright © 2001 Stephen Williams (steve@icarus.com)
5 4 * Copyright © 2002 David Brownell (dbrownell@users.sourceforge.net)
... ... @@ -20,23 +19,10 @@
20 19 * along with this program; if not, write to the Free Software
21 20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
22 21 */
23   -#if !defined(_MSC_VER)
24   -#include <stdbool.h>
25   -#else
26   -#define __attribute__(x)
27   -#if !defined(bool)
28   -#define bool int
29   -#endif
30   -#if !defined(true)
31   -#define true(1 == 1)
32   -#endif
33   -#if !defined(false)
34   -#define false(!true)
35   -#endif
36   -#if defined(_PREFAST_)
37   -#pragma warning(disable : 28193)
38   -#endif
39   -#endif
  22 +
  23 +#include <inttypes.h>
  24 +
  25 +struct libusb_device_handle;
40 26  
41 27 #define FX_TYPE_UNDEFINED -1
42 28 #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
109 95 /* Verbosity level (default 1). Can be increased or decreased with options v/q
110 96 */
111 97 extern int verbose;
112   -
113   -#endif
... ...