diff options
Diffstat (limited to 'devel/android-tools-adb-devel/files')
3 files changed, 15 insertions, 4 deletions
diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile index a76c118d406f..2602f8264550 100644 --- a/devel/android-tools-adb-devel/files/Makefile +++ b/devel/android-tools-adb-devel/files/Makefile @@ -26,8 +26,8 @@ TEST_SRCS+= adb_io_test.cpp TEST_SRCS+= adb_utils_test.cpp TEST_SRCS+= fdevent_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp +TEST_SRCS+= socket_test.cpp TEST_SRCS+= transport_test.cpp -CFLAGS.shell_service_protocol_test.cpp+= -Dsighandler_t=sig_t .PATH: ${.CURDIR}/client SRCS+= main.cpp diff --git a/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp b/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp new file mode 100644 index 000000000000..9442e9aa10f4 --- /dev/null +++ b/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp @@ -0,0 +1,11 @@ +--- adb/fdevent.cpp.orig 2015-09-17 22:58:36 UTC ++++ adb/fdevent.cpp +@@ -53,7 +53,7 @@ int SHELL_EXIT_NOTIFY_FD = -1; + + struct PollNode { + fdevent* fde; +- pollfd pollfd; ++ ::pollfd pollfd; // -fpermissive + + PollNode(fdevent* fde) : fde(fde) { + memset(&pollfd, 0, sizeof(pollfd)); diff --git a/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp b/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp index 7fa09ed98233..492e538cf860 100644 --- a/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp +++ b/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp @@ -1,9 +1,9 @@ ---- adb/fdevent_test.cpp.orig 2015-09-05 00:01:27 UTC +--- adb/fdevent_test.cpp.orig 2015-09-17 22:58:36 UTC +++ adb/fdevent_test.cpp -@@ -18,6 +18,7 @@ - +@@ -19,6 +19,7 @@ #include <gtest/gtest.h> + #include <limits> +#include <memory> // std::unique_ptr #include <queue> #include <string> |