FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the libusb and hidapi includes

Browse Source 
The libusb and hidapi pkg-config files already add the subdirectory to
the header search path with:

   -I/usr/include/libusb-1.0
   -I/usr/include/hidapi

Therefore, using the subdirectory in the include statement is wrong. In
practice, this usualy works fine by accident, because the base directory
(/usr/include) is typically listed in the default search path of the
compiler. But that's not always true. For example when cross-compiling
or when using the PKG_CONFIG_LIBDIR environment variable.
This commit is contained in:
Jef Driesen 2018-08-28 21:57:52 +02:00
parent 631cfd8c45
commit b1d434f0ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/atomics_cobalt.c
View File

@ -30,7 +30,7 @@
#ifdef _WIN32 #ifdef _WIN32
#define NOGDI #define NOGDI
#endif #endif
#include <libusb-1.0/libusb.h> #include <libusb.h>
#endif #endif
#include "atomics_cobalt.h" #include "atomics_cobalt.h"

4
src/usbhid.c
View File

@ -45,9 +45,9 @@
#ifdef _WIN32 #ifdef _WIN32
#define NOGDI #define NOGDI
#endif #endif
#include <libusb-1.0/libusb.h> #include <libusb.h>
#elif defined(USE_HIDAPI) #elif defined(USE_HIDAPI)
#include <hidapi/hidapi.h> #include <hidapi.h>
#endif #endif
#include <libdivecomputer/usbhid.h> #include <libdivecomputer/usbhid.h>