X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=src%2Fftdi.h;h=fd9a8a968c3c4257498a4488e3125c68ba7414b3;hp=fa53b2903480de9abbd14184423f3109f327ba79;hb=223e5aae4f0dcf228d758ae60f02398e3d1e95da;hpb=1b1bf7e481bc29ffac3b4c6a6da9eeff36beb1d0 diff --git a/src/ftdi.h b/src/ftdi.h index fa53b29..fd9a8a9 100644 --- a/src/ftdi.h +++ b/src/ftdi.h @@ -18,7 +18,9 @@ #define __libftdi_h__ #include +#ifndef _WIN32 #include +#endif /* 'interface' might be defined as a macro on Windows, so we need to * undefine it so as not to break the current libftdi API, because @@ -480,9 +482,13 @@ extern "C" void ftdi_list_free(struct ftdi_device_list **devlist); void ftdi_list_free2(struct ftdi_device_list *devlist); int ftdi_usb_get_strings(struct ftdi_context *ftdi, struct libusb_device *dev, - char * manufacturer, int mnf_len, - char * description, int desc_len, - char * serial, int serial_len); + char *manufacturer, int mnf_len, + char *description, int desc_len, + char *serial, int serial_len); + int ftdi_usb_get_strings2(struct ftdi_context *ftdi, struct libusb_device *dev, + char *manufacturer, int mnf_len, + char *description, int desc_len, + char *serial, int serial_len); int ftdi_eeprom_set_strings(struct ftdi_context *ftdi, char * manufacturer, char * product, char * serial);