43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
|
usb_linux.c: fix minor()/major() build failure due to glibc 2.28
|
||
|
|
|
||
|
|
glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>,
|
||
|
|
and therefore <sys/sysmacros.h> must be included explicitly when
|
||
|
|
major()/minor() are used.
|
||
|
|
|
||
|
|
This commit adds a patch to directly include <sys/sysmacros.h> into
|
||
|
|
all usb_linux.c files where minor() and major() macros are used.
|
||
|
|
|
||
|
|
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c
|
||
|
|
--- host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c 2013-02-18 15:49:03.000000000 +0100
|
||
|
|
+++ host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c 2018-09-09 11:47:16.476292546 +0200
|
||
|
|
@@ -20,6 +20,7 @@
|
||
|
|
#include <string.h>
|
||
|
|
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
+#include <sys/sysmacros.h>
|
||
|
|
#include <sys/types.h>
|
||
|
|
#include <sys/time.h>
|
||
|
|
#include <dirent.h>
|
||
|
|
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c
|
||
|
|
--- host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c 2018-09-09 02:32:57.154503866 +0200
|
||
|
|
+++ host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c 2018-09-09 11:47:28.148353880 +0200
|
||
|
|
@@ -20,6 +20,7 @@
|
||
|
|
#include <string.h>
|
||
|
|
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
+#include <sys/sysmacros.h>
|
||
|
|
#include <sys/types.h>
|
||
|
|
#include <sys/time.h>
|
||
|
|
#include <dirent.h>
|
||
|
|
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c
|
||
|
|
--- host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c 2013-02-18 15:49:03.000000000 +0100
|
||
|
|
+++ host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c 2018-09-09 11:46:53.028169154 +0200
|
||
|
|
@@ -33,6 +33,7 @@
|
||
|
|
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
#include <sys/stat.h>
|
||
|
|
+#include <sys/sysmacros.h>
|
||
|
|
#include <sys/types.h>
|
||
|
|
#include <dirent.h>
|
||
|
|
#include <fcntl.h>
|