Fredrik Fornwall
7 years ago
19 changed files with 112 additions and 358 deletions
@ -1,111 +0,0 @@ |
|||||
Add <arpa/ftp.h> for some ftp defines which some packages needs. |
|
||||
|
|
||||
diff -Nur /Users/fornwall/lib/android-ndk/platforms/android-18/arch-arm/usr/include/arpa/ftp.h ./usr/include/arpa/ftp.h
|
|
||||
--- /Users/fornwall/lib/android-ndk/platforms/android-18/arch-arm/usr/include/arpa/ftp.h 1970-01-01 01:00:00.000000000 +0100
|
|
||||
+++ ./usr/include/arpa/ftp.h 2014-02-07 02:07:52.000000000 +0100
|
|
||||
@@ -0,0 +1,105 @@
|
|
||||
+/*
|
|
||||
+ * Copyright (c) 1983, 1989, 1993
|
|
||||
+ * The Regents of the University of California. All rights reserved.
|
|
||||
+ *
|
|
||||
+ * Redistribution and use in source and binary forms, with or without
|
|
||||
+ * modification, are permitted provided that the following conditions
|
|
||||
+ * are met:
|
|
||||
+ * 1. Redistributions of source code must retain the above copyright
|
|
||||
+ * notice, this list of conditions and the following disclaimer.
|
|
||||
+ * 2. Redistributions in binary form must reproduce the above copyright
|
|
||||
+ * notice, this list of conditions and the following disclaimer in the
|
|
||||
+ * documentation and/or other materials provided with the distribution.
|
|
||||
+ * 4. Neither the name of the University nor the names of its contributors
|
|
||||
+ * may be used to endorse or promote products derived from this software
|
|
||||
+ * without specific prior written permission.
|
|
||||
+ *
|
|
||||
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
||||
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
||||
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||
+ * SUCH DAMAGE.
|
|
||||
+ *
|
|
||||
+ * @(#)ftp.h 8.1 (Berkeley) 6/2/93
|
|
||||
+ */
|
|
||||
+
|
|
||||
+#ifndef _ARPA_FTP_H
|
|
||||
+#define _ARPA_FTP_H 1
|
|
||||
+
|
|
||||
+/* Definitions for FTP; see RFC-765. */
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Reply codes.
|
|
||||
+ */
|
|
||||
+#define PRELIM 1 /* positive preliminary */
|
|
||||
+#define COMPLETE 2 /* positive completion */
|
|
||||
+#define CONTINUE 3 /* positive intermediate */
|
|
||||
+#define TRANSIENT 4 /* transient negative completion */
|
|
||||
+#define ERROR 5 /* permanent negative completion */
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Type codes
|
|
||||
+ */
|
|
||||
+#define TYPE_A 1 /* ASCII */
|
|
||||
+#define TYPE_E 2 /* EBCDIC */
|
|
||||
+#define TYPE_I 3 /* image */
|
|
||||
+#define TYPE_L 4 /* local byte size */
|
|
||||
+
|
|
||||
+#ifdef FTP_NAMES
|
|
||||
+char *typenames[] = {"0", "ASCII", "EBCDIC", "Image", "Local" };
|
|
||||
+#endif
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Form codes
|
|
||||
+ */
|
|
||||
+#define FORM_N 1 /* non-print */
|
|
||||
+#define FORM_T 2 /* telnet format effectors */
|
|
||||
+#define FORM_C 3 /* carriage control (ASA) */
|
|
||||
+#ifdef FTP_NAMES
|
|
||||
+char *formnames[] = {"0", "Nonprint", "Telnet", "Carriage-control" };
|
|
||||
+#endif
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Structure codes
|
|
||||
+ */
|
|
||||
+#define STRU_F 1 /* file (no record structure) */
|
|
||||
+#define STRU_R 2 /* record structure */
|
|
||||
+#define STRU_P 3 /* page structure */
|
|
||||
+#ifdef FTP_NAMES
|
|
||||
+char *strunames[] = {"0", "File", "Record", "Page" };
|
|
||||
+#endif
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Mode types
|
|
||||
+ */
|
|
||||
+#define MODE_S 1 /* stream */
|
|
||||
+#define MODE_B 2 /* block */
|
|
||||
+#define MODE_C 3 /* compressed */
|
|
||||
+#ifdef FTP_NAMES
|
|
||||
+char *modenames[] = {"0", "Stream", "Block", "Compressed" };
|
|
||||
+#endif
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Record Tokens
|
|
||||
+ */
|
|
||||
+#define REC_ESC '\377' /* Record-mode Escape */
|
|
||||
+#define REC_EOR '\001' /* Record-mode End-of-Record */
|
|
||||
+#define REC_EOF '\002' /* Record-mode End-of-File */
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Block Header
|
|
||||
+ */
|
|
||||
+#define BLK_EOR 0x80 /* Block is End-of-Record */
|
|
||||
+#define BLK_EOF 0x40 /* Block is End-of-File */
|
|
||||
+#define BLK_ERRORS 0x20 /* Block is suspected of containing errors */
|
|
||||
+#define BLK_RESTART 0x10 /* Block is Restart Marker */
|
|
||||
+
|
|
||||
+#define BLK_BYTECOUNT 2 /* Bytes in this block */
|
|
||||
+
|
|
||||
+#endif /* arpa/ftp.h */
|
|
||||
@ -1,88 +0,0 @@ |
|||||
The <arpa/tftp.h> header is needed by inetutils. |
|
||||
|
|
||||
diff -N -a -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/arpa/tftp.h ./usr/include/arpa/tftp.h
|
|
||||
--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/arpa/tftp.h 1969-12-31 19:00:00.000000000 -0500
|
|
||||
+++ ./usr/include/arpa/tftp.h 2015-05-12 15:40:31.648145474 -0400
|
|
||||
@@ -0,0 +1,82 @@
|
|
||||
+/*
|
|
||||
+ * Copyright (c) 1983, 1993
|
|
||||
+ * The Regents of the University of California. All rights reserved.
|
|
||||
+ *
|
|
||||
+ * Redistribution and use in source and binary forms, with or without
|
|
||||
+ * modification, are permitted provided that the following conditions
|
|
||||
+ * are met:
|
|
||||
+ * 1. Redistributions of source code must retain the above copyright
|
|
||||
+ * notice, this list of conditions and the following disclaimer.
|
|
||||
+ * 2. Redistributions in binary form must reproduce the above copyright
|
|
||||
+ * notice, this list of conditions and the following disclaimer in the
|
|
||||
+ * documentation and/or other materials provided with the distribution.
|
|
||||
+ * 4. Neither the name of the University nor the names of its contributors
|
|
||||
+ * may be used to endorse or promote products derived from this software
|
|
||||
+ * without specific prior written permission.
|
|
||||
+ *
|
|
||||
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
||||
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
||||
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||
+ * SUCH DAMAGE.
|
|
||||
+ *
|
|
||||
+ * @(#)tftp.h 8.1 (Berkeley) 6/2/93
|
|
||||
+ */
|
|
||||
+
|
|
||||
+#ifndef _ARPA_TFTP_H
|
|
||||
+#define _ARPA_TFTP_H 1
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Trivial File Transfer Protocol (IEN-133)
|
|
||||
+ */
|
|
||||
+#define SEGSIZE 512 /* data segment size */
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Packet types.
|
|
||||
+ */
|
|
||||
+#define RRQ 01 /* read request */
|
|
||||
+#define WRQ 02 /* write request */
|
|
||||
+#define DATA 03 /* data packet */
|
|
||||
+#define ACK 04 /* acknowledgement */
|
|
||||
+#define ERROR 05 /* error code */
|
|
||||
+
|
|
||||
+struct tftphdr {
|
|
||||
+ short th_opcode; /* packet type */
|
|
||||
+ union {
|
|
||||
+ char tu_padding[3]; /* sizeof() compat */
|
|
||||
+ struct {
|
|
||||
+ union {
|
|
||||
+ unsigned short tu_block; /* block # */
|
|
||||
+ short tu_code; /* error code */
|
|
||||
+ } __attribute__ ((__packed__)) th_u3;
|
|
||||
+ char tu_data[0]; /* data or error string */
|
|
||||
+ } __attribute__ ((__packed__)) th_u2;
|
|
||||
+ char tu_stuff[0]; /* request packet stuff */
|
|
||||
+ } __attribute__ ((__packed__)) th_u1;
|
|
||||
+} __attribute__ ((__packed__));
|
|
||||
+
|
|
||||
+#define th_block th_u1.th_u2.th_u3.tu_block
|
|
||||
+#define th_code th_u1.th_u2.th_u3.tu_code
|
|
||||
+#define th_stuff th_u1.tu_stuff
|
|
||||
+#define th_data th_u1.th_u2.tu_data
|
|
||||
+#define th_msg th_u1.th_u2.tu_data
|
|
||||
+
|
|
||||
+/*
|
|
||||
+ * Error codes.
|
|
||||
+ */
|
|
||||
+#define EUNDEF 0 /* not defined */
|
|
||||
+#define ENOTFOUND 1 /* file not found */
|
|
||||
+#define EACCESS 2 /* access violation */
|
|
||||
+#define ENOSPACE 3 /* disk full or allocation exceeded */
|
|
||||
+#define EBADOP 4 /* illegal TFTP operation */
|
|
||||
+#define EBADID 5 /* unknown transfer ID */
|
|
||||
+#define EEXISTS 6 /* file already exists */
|
|
||||
+#define ENOUSER 7 /* no such user */
|
|
||||
+
|
|
||||
+#endif /* arpa/tftp.h */
|
|
||||
@ -1,17 +0,0 @@ |
|||||
Avoid defining constants which causes at least dpkg build to think that |
|
||||
sync_file_range(2) is available - which it is not. |
|
||||
|
|
||||
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/fcntl.h ./usr/include/fcntl.h
|
|
||||
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/fcntl.h 2017-06-07 01:07:52.000000000 +0200
|
|
||||
+++ ./usr/include/fcntl.h 2017-06-18 02:03:25.533276409 +0200
|
|
||||
@@ -61,10 +61,6 @@
|
|
||||
#define SPLICE_F_MORE 4 |
|
||||
#define SPLICE_F_GIFT 8 |
|
||||
|
|
||||
-#define SYNC_FILE_RANGE_WAIT_BEFORE 1
|
|
||||
-#define SYNC_FILE_RANGE_WRITE 2
|
|
||||
-#define SYNC_FILE_RANGE_WAIT_AFTER 4
|
|
||||
-
|
|
||||
int creat(const char*, mode_t); |
|
||||
|
|
||||
#if __ANDROID_API__ >= 21 |
|
||||
@ -1,12 +0,0 @@ |
|||||
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/limits.h ./usr/include/limits.h
|
|
||||
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/limits.h 2017-06-07 01:07:52.000000000 +0200
|
|
||||
+++ ./usr/include/limits.h 2017-06-18 02:05:17.404056395 +0200
|
|
||||
@@ -139,7 +139,7 @@
|
|
||||
#define HOST_NAME_MAX _POSIX_HOST_NAME_MAX |
|
||||
|
|
||||
#define _POSIX_VERSION 200809L /* Posix C language bindings version */ |
|
||||
-#define _POSIX2_VERSION -1 /* we don't support Posix command-line tools */
|
|
||||
+#define _POSIX2_VERSION 200809 /* Termux change to avoid coreutils obsolete breakage */
|
|
||||
#define _XOPEN_VERSION 700 /* by Posix definition */ |
|
||||
|
|
||||
/* >= _POSIX_THREAD_DESTRUCTOR_ITERATIONS */ |
|
||||
@ -1,18 +1,16 @@ |
|||||
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/linux/fcntl.h ./usr/include/linux/fcntl.h
|
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/linux/fcntl.h ./usr/include/linux/fcntl.h
|
||||
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/linux/fcntl.h 2017-06-07 01:07:52.000000000 +0200
|
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/linux/fcntl.h 2017-11-09 09:57:12.000000000 +0100
|
||||
+++ ./usr/include/linux/fcntl.h 2017-06-18 01:44:54.697429382 +0200
|
+++ ./usr/include/linux/fcntl.h 2017-11-15 11:49:10.709710452 +0100
|
||||
@@ -46,6 +46,14 @@
|
@@ -40,6 +40,12 @@
|
||||
|
#define DN_ATTRIB 0x00000020 |
||||
#define DN_MULTISHOT 0x80000000 |
#define DN_MULTISHOT 0x80000000 |
||||
#define AT_FDCWD - 100 |
#define AT_FDCWD - 100 |
||||
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ |
|
||||
+
|
|
||||
+/* Termux patch: This flag is not supported on Android 6.0+, and should not
|
+/* Termux patch: This flag is not supported on Android 6.0+, and should not
|
||||
+ be needed since there are not setuid binaries. Define AT_EACCESS to 0 to
|
+ be needed since there are not setuid binaries. Define AT_EACCESS to 0 to
|
||||
+ avoid packages defining their own AT_EACCESS (which e.g. coreutil does)
|
+ avoid packages defining their own AT_EACCESS (which e.g. coreutil does)
|
||||
+ since that will only result in errors. See:
|
+ since that will only result in errors. See:
|
||||
+ https://android.googlesource.com/platform/bionic/+/3577825%5E!/ */
|
+ https://android.googlesource.com/platform/bionic/+/3577825%5E!/ */
|
||||
+#define AT_EACCESS 0
|
+#define AT_EACCESS 0
|
||||
+
|
|
||||
#define AT_SYMLINK_NOFOLLOW 0x100 |
#define AT_SYMLINK_NOFOLLOW 0x100 |
||||
#define AT_REMOVEDIR 0x200 |
#define AT_REMOVEDIR 0x200 |
||||
#define AT_SYMLINK_FOLLOW 0x400 |
#define AT_SYMLINK_FOLLOW 0x400 |
||||
|
|||||
@ -1,18 +1,19 @@ |
|||||
In Termux these are implemented in the libutil package to support android-21. |
|
||||
|
|
||||
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/pty.h ./usr/include/pty.h
|
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/pty.h ./usr/include/pty.h
|
||||
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/pty.h 2017-06-20 17:41:56.000000000 +0200
|
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/pty.h 2017-11-09 09:57:12.000000000 +0100
|
||||
+++ ./usr/include/pty.h 2017-07-02 11:42:39.244882732 +0200
|
+++ ./usr/include/pty.h 2017-11-15 11:52:53.115077179 +0100
|
||||
@@ -37,10 +37,8 @@
|
@@ -36,12 +36,9 @@
|
||||
__BEGIN_DECLS |
|
||||
|
|
||||
|
__BEGIN_DECLS |
||||
|
|
||||
|
-
|
||||
-#if __ANDROID_API__ >= 23
|
-#if __ANDROID_API__ >= 23
|
||||
-int openpty(int*, int*, char*, const struct termios*, const struct winsize*) __INTRODUCED_IN(23);
|
-int openpty(int* __master_fd, int* __slave_fd, char* __slave_name, const struct termios* __termios_ptr, const struct winsize* __winsize_ptr) __INTRODUCED_IN(23);
|
||||
-int forkpty(int*, char*, const struct termios*, const struct winsize*) __INTRODUCED_IN(23);
|
-int forkpty(int* __master_fd, char* __slave_name, const struct termios* __termios_ptr, const struct winsize* __winsize_ptr) __INTRODUCED_IN(23);
|
||||
-#endif /* __ANDROID_API__ >= 23 */
|
-#endif /* __ANDROID_API__ >= 23 */
|
||||
+int openpty(int*, int*, char*, const struct termios*, const struct winsize*);
|
-
|
||||
+int forkpty(int*, char*, const struct termios*, const struct winsize*);
|
+/* In Termux these are implemented in the libutil package to support android-21. */
|
||||
|
+int openpty(int* __master_fd, int* __slave_fd, char* __slave_name, const struct termios* __termios_ptr, const struct winsize* __winsize_ptr);
|
||||
|
+int forkpty(int* __master_fd, char* __slave_name, const struct termios* __termios_ptr, const struct winsize* __winsize_ptr);
|
||||
|
|
||||
__END_DECLS |
__END_DECLS |
||||
|
|
||||
|
|||||
@ -0,0 +1,20 @@ |
|||||
|
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/spawn.h ./usr/include/spawn.h
|
||||
|
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/spawn.h 2017-11-09 09:57:12.000000000 +0100
|
||||
|
+++ ./usr/include/spawn.h 2017-11-15 12:08:34.911786251 +0100
|
||||
|
@@ -36,6 +36,8 @@
|
||||
|
|
||||
|
__BEGIN_DECLS |
||||
|
|
||||
|
+#if __ANDROID_API__ >= __ANDROID_API_FUTURE__
|
||||
|
+
|
||||
|
#define POSIX_SPAWN_RESETIDS 1 |
||||
|
#define POSIX_SPAWN_SETPGROUP 2 |
||||
|
#define POSIX_SPAWN_SETSIGDEF 4 |
||||
|
@@ -51,7 +53,6 @@
|
||||
|
typedef struct __posix_spawn_file_actions* posix_spawn_file_actions_t; |
||||
|
|
||||
|
|
||||
|
-#if __ANDROID_API__ >= __ANDROID_API_FUTURE__
|
||||
|
int posix_spawn(pid_t* __pid, const char* __path, const posix_spawn_file_actions_t* __actions, const posix_spawnattr_t* __attr, char* const __argv[], char* const __env[]) __INTRODUCED_IN_FUTURE; |
||||
|
int posix_spawnp(pid_t* __pid, const char* __file, const posix_spawn_file_actions_t* __actions, const posix_spawnattr_t* __attr, char* const __argv[], char* const __env[]) __INTRODUCED_IN_FUTURE; |
||||
|
|
||||
@ -1,35 +0,0 @@ |
|||||
See https://github.com/android-ndk/ndk/issues/440 |
|
||||
|
|
||||
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/string.h ./usr/include/string.h
|
|
||||
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/string.h 2017-06-20 17:41:56.000000000 +0200
|
|
||||
+++ ./usr/include/string.h 2017-06-30 22:15:01.161342640 +0200
|
|
||||
@@ -74,12 +74,12 @@
|
|
||||
#endif /* __ANDROID_API__ >= 18 */ |
|
||||
|
|
||||
#if defined(__USE_GNU) |
|
||||
+#if __ANDROID_API__ >= 24
|
|
||||
#if defined(__cplusplus) |
|
||||
extern "C++" char* strchrnul(char* _Nonnull, int) __RENAME(strchrnul) __attribute_pure__; |
|
||||
extern "C++" const char* strchrnul(const char* _Nonnull, int) __RENAME(strchrnul) __attribute_pure__; |
|
||||
#else |
|
||||
|
|
||||
-#if __ANDROID_API__ >= 24
|
|
||||
char* strchrnul(const char* _Nonnull, int) __attribute_pure__ __INTRODUCED_IN(24); |
|
||||
#endif /* __ANDROID_API__ >= 24 */ |
|
||||
|
|
||||
@@ -169,6 +169,7 @@
|
|
||||
#endif |
|
||||
|
|
||||
#if defined(__USE_GNU) && !defined(basename) |
|
||||
+#if __ANDROID_API__ >= 23
|
|
||||
/* |
|
||||
* glibc has a basename in <string.h> that's different to the POSIX one in <libgen.h>. |
|
||||
* It doesn't modify its argument, and in C++ it's const-correct. |
|
||||
@@ -178,7 +179,6 @@
|
|
||||
extern "C++" const char* basename(const char* _Nonnull) __RENAME(__gnu_basename); |
|
||||
#else |
|
||||
|
|
||||
-#if __ANDROID_API__ >= 23
|
|
||||
char* basename(const char* _Nonnull) __RENAME(__gnu_basename) __INTRODUCED_IN(23); |
|
||||
#endif /* __ANDROID_API__ >= 23 */ |
|
||||
|
|
||||
@ -1,14 +0,0 @@ |
|||||
Needed by util-linux. |
|
||||
|
|
||||
diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/sys/ttydefaults.h ./usr/include/sys/ttydefaults.h
|
|
||||
--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/sys/ttydefaults.h 2016-06-01 12:53:26.000000000 -0400
|
|
||||
+++ ./usr/include/sys/ttydefaults.h 2016-06-22 06:29:26.247578626 -0400
|
|
||||
@@ -46,7 +46,7 @@
|
|
||||
* Defaults on "first" open. |
|
||||
*/ |
|
||||
#define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY) |
|
||||
-#define TTYDEF_OFLAG (OPOST | ONLCR | OXTABS)
|
|
||||
+#define TTYDEF_OFLAG (OPOST | ONLCR | XTABS)
|
|
||||
#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) |
|
||||
#define TTYDEF_CFLAG (CREAD | CS8 | HUPCL) |
|
||||
#define TTYDEF_SPEED (B9600) |
|
||||
@ -1,18 +1,17 @@ |
|||||
In Termux login_tty() is implemented in the libutil package to support android-21. |
|
||||
|
|
||||
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/utmp.h ./usr/include/utmp.h
|
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/utmp.h ./usr/include/utmp.h
|
||||
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/utmp.h 2017-06-20 17:41:56.000000000 +0200
|
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/utmp.h 2017-11-09 09:57:12.000000000 +0100
|
||||
+++ ./usr/include/utmp.h 2017-07-10 09:47:42.422659110 +0200
|
+++ ./usr/include/utmp.h 2017-11-15 12:01:37.108811692 +0100
|
||||
@@ -101,11 +101,7 @@
|
@@ -101,11 +101,8 @@
|
||||
struct utmp* getutent(void); |
struct utmp* getutent(void); |
||||
void endutent(void); |
void endutent(void); |
||||
|
|
||||
-
|
-
|
||||
-#if __ANDROID_API__ >= 23
|
-#if __ANDROID_API__ >= 23
|
||||
-int login_tty(int) __INTRODUCED_IN(23);
|
-int login_tty(int __fd) __INTRODUCED_IN(23);
|
||||
-#endif /* __ANDROID_API__ >= 23 */
|
-#endif /* __ANDROID_API__ >= 23 */
|
||||
-
|
-
|
||||
+int login_tty(int);
|
+/* In Termux login_tty() is implemented in the libutil package to support android-21. */
|
||||
|
+int login_tty(int __fd);
|
||||
|
|
||||
__END_DECLS |
__END_DECLS |
||||
|
|
||||
|
|||||
Loading…
Reference in new issue