Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0fe73012
Commit
0fe73012
authored
Aug 15, 2013
by
Ken Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert last change to gmalloc.c; update some comments.
parent
691a357f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
16 deletions
+20
-16
ChangeLog
ChangeLog
+4
-0
configure.ac
configure.ac
+8
-6
src/ChangeLog
src/ChangeLog
+6
-0
src/emacs.c
src/emacs.c
+2
-1
src/gmalloc.c
src/gmalloc.c
+0
-9
No files found.
ChangeLog
View file @
0fe73012
2013-08-15 Ken Brown <kbrown@cornell.edu>
* configure.ac (G_SLICE_ALWAYS_MALLOC): Update comment.
2013-08-15 Glenn Morris <rgm@gnu.org>
* make-dist: Do not distribute etc/refcards TeX intermediate files.
...
...
configure.ac
View file @
0fe73012
...
...
@@ -4340,14 +4340,16 @@ fi
case $opsys in
dnl Emacs supplies its own malloc, but glib (part of Gtk+) calls
dnl memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
dnl As malloc is not the Cygwin malloc, the Cygwin memalign always
dnl returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */
dnl Emacs supplies its own malloc, but glib calls posix_memalign,
dnl and on Cygwin prior to version 1.7.24 that becomes the
dnl Cygwin-supplied posix_memalign. As malloc is not the Cygwin
dnl malloc, the Cygwin posix_memalign always returns ENOSYS. A
dnl workaround is to set G_SLICE=always-malloc. This is no longer
dnl needed starting with cygwin-1.7.24, and it is no longer
dnl effective starting with glib-2.36. */
cygwin)
AC_DEFINE(G_SLICE_ALWAYS_MALLOC, 1, [Define to set the
G_SLICE environment variable to "always-malloc" at startup, if
using GTK.])
G_SLICE environment variable to "always-malloc" at startup.])
;;
hpux11)
...
...
src/ChangeLog
View file @
0fe73012
2013-08-15 Ken Brown <kbrown@cornell.edu>
* emacs.c (main): Update comment about G_SLICE_ALWAYS_MALLOC.
* gmalloc.c (memalign) [CYGWIN]: Revert last change; it's not
needed.
2013-08-15 Paul Eggert <eggert@cs.ucla.edu>
Fix minor problems found by static checking.
...
...
src/emacs.c
View file @
0fe73012
...
...
@@ -696,7 +696,8 @@ main (int argc, char **argv)
#endif
#ifdef G_SLICE_ALWAYS_MALLOC
/* This is used by the Cygwin build. */
/* This is used by the Cygwin build. It's not needed starting with
cygwin-1.7.24, but it doesn't do any harm. */
xputenv
(
"G_SLICE=always-malloc"
);
#endif
...
...
src/gmalloc.c
View file @
0fe73012
...
...
@@ -1558,15 +1558,6 @@ 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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment