merge from trunk

2 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 415c4c3f525..43e9bca061b 100644
--- 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 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)
 {