diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-05-09 00:47:30 +0100 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-05-09 00:47:30 +0100 |
| commit | 3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4 (patch) | |
| tree | afd9aac45d87ca26cd83e5b176069195250a3d7f /stdafx.h | |
| parent | d070ed533fe8afdc672c6f04875f2c73f478c196 (diff) | |
| parent | 260123716172d33f44bdc0e4e5422554d139215c (diff) | |
| download | libphidget21-3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4.tar.gz | |
Merge tag 'upstream/2.1.8.20120507'
Upstream version 2.1.8.20120507
Diffstat (limited to 'stdafx.h')
| -rw-r--r-- | stdafx.h | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -48,6 +48,9 @@ #ifdef _WINDOWS // Defines & Include for Windows only + #ifndef AI_ADDRCONFIG + #define AI_ADDRCONFIG 0x00000400 // Resolution only if global address configured + #endif //On Windows (but not WinCE), compile in Labview functions #ifndef WINCE @@ -232,11 +235,6 @@ #elif _LINUX // Defines & Include for Linux Only - - // No libusb on Android - #ifndef _ANDROID - #include <usb.h> - #endif #include <assert.h> #include <dlfcn.h> |