Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #544 from stilor/caddr-patch
Propagate caddr_t patch to other glibc versions
- Loading branch information
Showing
4 changed files
with
60 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|