* src/gmalloc.c [CYGWIN]: Rename memalign (Bug#15094).

diff --git a/src/ChangeLog b/src/ChangeLog
index 415c4c3f5257030cce85a543277e51a6ae569fe5..43e9bca061bec7ee1eb5095e5b8497a3a8117490 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-14  Ken Brown  <kbrown@cornell.edu>
+
+       * gmalloc.c (memalign) [CYGWIN]: Rename to emacs_memalign
+       (Bug#15094).
+
 2013-08-14  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Utility function and macro to copy Lisp string to C string.

diff --git a/src/gmalloc.c b/src/gmalloc.c
index bc1d85ac5fbb0ac1ae34f1b3f606d394f9d81388..42ac0b039854abae1d4abc1efb6835e7671b532c 100644 (file)
--- 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)
 {