[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113880: * src/gmalloc.c [CYGWIN]: Rename memalign (
From: |
Ken Brown |
Subject: |
[Emacs-diffs] trunk r113880: * src/gmalloc.c [CYGWIN]: Rename memalign (Bug#15094). |
Date: |
Wed, 14 Aug 2013 19:10:12 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113880
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-14 15:09:51 -0400
message:
* src/gmalloc.c [CYGWIN]: Rename memalign (Bug#15094).
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/gmalloc.c gmalloc.c-20091113204419-o5vbwnq5f7feedwu-1085
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-08-14 16:36:16 +0000
+++ b/src/ChangeLog 2013-08-14 19:09:51 +0000
@@ -1,3 +1,8 @@
+2013-08-14 Ken Brown <address@hidden>
+
+ * gmalloc.c (memalign) [CYGWIN]: Rename to emacs_memalign
+ (Bug#15094).
+
2013-08-14 Dmitry Antipov <address@hidden>
Utility function and macro to copy Lisp string to C string.
=== modified file 'src/gmalloc.c'
--- a/src/gmalloc.c 2013-01-02 16:13:04 +0000
+++ b/src/gmalloc.c 2013-08-14 19:09:51 +0000
@@ -1558,6 +1558,15 @@
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)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113880: * src/gmalloc.c [CYGWIN]: Rename memalign (Bug#15094).,
Ken Brown <=