commit/XEmacs: kehoea: Don't redefine MAP_ANONYMOUS on Linux.

1 new commit in XEmacs: https://bitbucket.org/xemacs/xemacs/commits/6168ead69948/ Changeset: 6168ead69948 User: kehoea Date: 2017-11-23 07:03:47+00:00 Summary: Don't redefine MAP_ANONYMOUS on Linux. ChangeLog addition; 2017-11-23 Aidan Kehoe <kehoea(a)parhasard.net&gt; * configure.ac (XE_COMPLEX_ARG): [...] Be careful not to redefine an existing definition for MAP_ANONYMOUS src/ChangeLog addition: 2017-11-23 Aidan Kehoe <kehoea(a)parhasard.net&gt; * ralloc.c: [...] Be careful not to redefine an existing definition for MAP_ANONYMOUS Affected #: 5 files diff -r e02d10a9c9c805b9d5253f0cef5301927fb01c0f -r 6168ead6994890afd2c42099741024d6b0f88f24 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -6,6 +6,7 ＠＠ systems. Accept MAP_ANON, a BSDism, as an alias for MAP_ANONYMOUS here. + Be careful not to redefine an existing definition for MAP_ANONYMOUS Remove a caddr_t variable, this type is long obsolete and the variable was unused. * configure: Regenerate. diff -r e02d10a9c9c805b9d5253f0cef5301927fb01c0f -r 6168ead6994890afd2c42099741024d6b0f88f24 configure --- a/configure +++ b/configure ＠＠ -19126,7 +19126,7 ＠＠ int main (int argc, char **argv) { int fd = -1; -#ifdef MAP_ANON +#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) #define MAP_ANONYMOUS MAP_ANON #endif #ifndef MAP_ANONYMOUS diff -r e02d10a9c9c805b9d5253f0cef5301927fb01c0f -r 6168ead6994890afd2c42099741024d6b0f88f24 configure.ac --- a/configure.ac +++ b/configure.ac ＠＠ -4831,7 +4831,7 ＠＠ int main (int argc, char **argv) { int fd = -1; -#ifdef MAP_ANON +#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) #define MAP_ANONYMOUS MAP_ANON #endif #ifndef MAP_ANONYMOUS diff -r e02d10a9c9c805b9d5253f0cef5301927fb01c0f -r 6168ead6994890afd2c42099741024d6b0f88f24 src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog ＠＠ -18,6 +18,7 ＠＠ caddr_t is long deprecated, use void * instead when calling mmap(). Accept MAP_ANON, an old BSDism, as an alias for MAP_ANONYMOUS. + Be careful not to redefine an existing definition for MAP_ANONYMOUS 2017-11-23 Aidan Kehoe <kehoea(a)parhasard.net&gt; diff -r e02d10a9c9c805b9d5253f0cef5301927fb01c0f -r 6168ead6994890afd2c42099741024d6b0f88f24 src/ralloc.c --- a/src/ralloc.c +++ b/src/ralloc.c ＠＠ -1248,7 +1248,7 ＠＠ # define MAP_ADDRCHOICE_FLAG 0 #endif /* MAP_ADDRCHOICE_FLAG */ -#ifdef MAP_ANON +#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) #define MAP_ANONYMOUS MAP_ANON #endif Repository URL: https://bitbucket.org/xemacs/xemacs/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.