diff options
| author |  bunnei | 2020-09-16 22:33:58 -0700 |
|---|---|---|
| committer |  GitHub | 2020-09-16 22:33:58 -0700 |
| commit | fcd0925ecff8022e33daf5b0385be1bd23eefcd5 (patch) | |
| tree | 69e7200a0a8f36f57da5d01e436fa1595743e87d /src/input_common | |
| parent | Merge pull request #4663 from ReinUsesLisp/wswitch (diff) | |
| parent | gc_adapter: Disable MSVC nonstandard extension warning on libusb.h (diff) | |
| download | yuzu-fcd0925ecff8022e33daf5b0385be1bd23eefcd5.tar.gz yuzu-fcd0925ecff8022e33daf5b0385be1bd23eefcd5.tar.xz yuzu-fcd0925ecff8022e33daf5b0385be1bd23eefcd5.zip | |
Merge pull request #4653 from ReinUsesLisp/gc-warns
gc_adapter: Disable MSVC nonstandard extension warning on libusb.h
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp index c6c423c4b..c507c9891 100644 --- a/src/input_common/gcadapter/gc_adapter.cpp +++ b/src/input_common/gcadapter/gc_adapter.cpp | |||
| @@ -4,7 +4,16 @@ | |||
| 4 | 4 | ||
| 5 | #include <chrono> | 5 | #include <chrono> |
| 6 | #include <thread> | 6 | #include <thread> |
| 7 | |||
| 8 | #ifdef _MSC_VER | ||
| 9 | #pragma warning(push) | ||
| 10 | #pragma warning(disable : 4200) // nonstandard extension used : zero-sized array in struct/union | ||
| 11 | #endif | ||
| 7 | #include <libusb.h> | 12 | #include <libusb.h> |
| 13 | #ifdef _MSC_VER | ||
| 14 | #pragma warning(pop) | ||
| 15 | #endif | ||
| 16 | |||
| 8 | #include "common/logging/log.h" | 17 | #include "common/logging/log.h" |
| 9 | #include "input_common/gcadapter/gc_adapter.h" | 18 | #include "input_common/gcadapter/gc_adapter.h" |
| 10 | 19 | ||