Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: third_party/libusb/libusb/libusb.h

Issue 10198035: Fix warnings in libusb.h so that other chromium code doesn't suffer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More WIN chicanery. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/libusb/libusb/os/poll_windows.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libusb/libusb/libusb.h
diff --git a/third_party/libusb/libusb/libusb.h b/third_party/libusb/libusb/libusb.h
index de2d05050333bd017dad925d35a60edb946acee3..beff229e1069f38ee2a588ab2e452685149c8b5d 100644
--- a/third_party/libusb/libusb/libusb.h
+++ b/third_party/libusb/libusb/libusb.h
@@ -833,6 +833,10 @@ typedef void (LIBUSB_CALL *libusb_transfer_cb_fn)(struct libusb_transfer *transf
* completed, the library populates the transfer with the results and passes
* it back to the user.
*/
+#if defined(OS_WIN)
+#pragma warning(push)
+#pragma warning(disable:4200)
+#endif // defined(OS_WIN)
struct libusb_transfer {
/** Handle of the device that this transfer will be submitted to */
libusb_device_handle *dev_handle;
@@ -884,12 +888,15 @@ struct libusb_transfer {
/** Isochronous packet descriptors, for isochronous transfers only. */
struct libusb_iso_packet_descriptor iso_packet_desc
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
- [] /* valid C99 code */
+ [] /* valid C99 code */
#else
- [0] /* non-standard, but usually working code */
+ [0] /* non-standard, but usually working code */
#endif
- ;
+ ;
};
+#if defined(OS_WIN)
+#pragma warning(pop)
+#endif // defined(OS_WIN)
/** \ingroup misc
* Capabilities supported by this instance of libusb. Test if the running
« no previous file with comments | « no previous file | third_party/libusb/libusb/os/poll_windows.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698