summaryrefslogtreecommitdiff
path: root/src/gmalloc.c
diff options
context:
space:
mode:
authorKen Brown <kbrown@cornell.edu>2013-08-14 15:09:51 -0400
committerKen Brown <kbrown@cornell.edu>2013-08-14 15:09:51 -0400
commit05e64f9f63f98108bb04f8ab45343e507862d8f4 (patch)
treeb58a7e61d75b2c4c3f2b3bcac5e19cbd90e4abf4 /src/gmalloc.c
parent5b71542de3ef7f08b7c30e93340502d7cc120910 (diff)
downloademacs-05e64f9f63f98108bb04f8ab45343e507862d8f4.tar.gz
emacs-05e64f9f63f98108bb04f8ab45343e507862d8f4.tar.bz2
emacs-05e64f9f63f98108bb04f8ab45343e507862d8f4.zip
* src/gmalloc.c [CYGWIN]: Rename memalign (Bug#15094).
Diffstat (limited to 'src/gmalloc.c')
-rw-r--r--src/gmalloc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index bc1d85ac5fb..42ac0b03985 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1558,6 +1558,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. *
void *(*__memalign_hook) (size_t size, size_t alignment);
+/* As of version 1.7.24, Cygwin allows applications to provide their
+ own posix_memalign (but not memalign). But posix_memalign as
+ defined in this file calls memalign, so we have to rename the
+ latter in order to make sure that posix_memalign calls Emacs's
+ memalign. */
+#ifdef CYGWIN
+#define memalign emacs_memalign
+#endif
+
void *
memalign (size_t alignment, size_t size)
{