Merge pull request #544 from stilor/caddr-patch

Propagate caddr_t patch to other glibc versions
This commit is contained in:
Alexey Neyman 2017-01-17 00:20:07 -08:00 committed by GitHub
commit 61d8314c3b
4 changed files with 60 additions and 0 deletions

View File

@ -0,0 +1,15 @@
diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
--- glibc-2.23-orig/posix/sys/types.h 2016-02-18 12:54:00.000000000 -0500
+++ glibc-2.23/posix/sys/types.h 2017-01-06 11:40:05.842147165 -0500
@@ -113,7 +113,10 @@
#ifdef __USE_MISC
# ifndef __daddr_t_defined
typedef __daddr_t daddr_t;
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
typedef __caddr_t caddr_t;
+# define __caddr_t_defined
+# endif
# define __daddr_t_defined
# endif
#endif

View File

@ -0,0 +1,15 @@
diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
--- glibc-2.23-orig/posix/sys/types.h 2016-02-18 12:54:00.000000000 -0500
+++ glibc-2.23/posix/sys/types.h 2017-01-06 11:40:05.842147165 -0500
@@ -113,7 +113,10 @@
#ifdef __USE_MISC
# ifndef __daddr_t_defined
typedef __daddr_t daddr_t;
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
typedef __caddr_t caddr_t;
+# define __caddr_t_defined
+# endif
# define __daddr_t_defined
# endif
#endif

View File

@ -0,0 +1,15 @@
diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
--- glibc-2.23-orig/posix/sys/types.h 2016-02-18 12:54:00.000000000 -0500
+++ glibc-2.23/posix/sys/types.h 2017-01-06 11:40:05.842147165 -0500
@@ -113,7 +113,10 @@
#ifdef __USE_MISC
# ifndef __daddr_t_defined
typedef __daddr_t daddr_t;
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
typedef __caddr_t caddr_t;
+# define __caddr_t_defined
+# endif
# define __daddr_t_defined
# endif
#endif

View File

@ -0,0 +1,15 @@
diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
--- glibc-2.23-orig/posix/sys/types.h 2016-02-18 12:54:00.000000000 -0500
+++ glibc-2.23/posix/sys/types.h 2017-01-06 11:40:05.842147165 -0500
@@ -113,7 +113,10 @@
#ifdef __USE_MISC
# ifndef __daddr_t_defined
typedef __daddr_t daddr_t;
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
typedef __caddr_t caddr_t;
+# define __caddr_t_defined
+# endif
# define __daddr_t_defined
# endif
#endif