[Emacs-diffs] emacs ChangeLog configure.in src/ChangeLog src/...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/12/09 01:06:36

Modified files:
        .              : ChangeLog configure.in 
        src            : ChangeLog emacs.c 
        src/s          : cygwin.h 

Log message:
        * configure.in: Allow compiling Emacs with GTK on Cygwin.
        
        * src/s/cygwin.h (G_SLICE_ALWAYS_MALLOC): New variable.
        
        * src/emacs.c (main): Set the G_SLICE environment variable for Cygwin
        GTK builds.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.870&r2=1.871
http://cvs.savannah.gnu.org/viewcvs/emacs/configure.in?cvsroot=emacs&r1=1.616&r2=1.617
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7912&r2=1.7913
http://cvs.savannah.gnu.org/viewcvs/emacs/src/emacs.c?cvsroot=emacs&r1=1.476&r2=1.477
http://cvs.savannah.gnu.org/viewcvs/emacs/src/s/cygwin.h?cvsroot=emacs&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/ChangeLog,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -b -r1.870 -r1.871
--- ChangeLog   1 Dec 2009 17:06:30 -0000       1.870
+++ ChangeLog   9 Dec 2009 01:06:32 -0000       1.871
@@ -1,3 +1,7 @@
+2009-12-09  Ken Brown  <address@hidden>  (tiny change)
+
+       * configure.in: Allow compiling Emacs with GTK on Cygwin.
+
 2009-12-01  Glenn Morris  <address@hidden>
 
        * make-dist: Add etc/images/mpc directory.

Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -b -r1.616 -r1.617
--- configure.in        21 Nov 2009 15:40:31 -0000      1.616
+++ configure.in        9 Dec 2009 01:06:33 -0000       1.617
@@ -3026,16 +3026,6 @@
 
 echo
 
-if test "$USE_X_TOOLKIT" = GTK; then
-  case "$canonical" in
-  *cygwin*)
-    echo "There are known problems with Emacs and Gtk+ on cygwin, so you
-  will probably get a crash on startup.  If this happens, please use another
-  toolkit for Emacs.  See etc/PROBLEMS for more information."
-  ;;
-  esac
-fi
-
 if test "$HAVE_NS" = "yes"; then
    echo
    echo "You must run \"make install\" in order to test the built application.

Index: src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7912
retrieving revision 1.7913
diff -u -b -r1.7912 -r1.7913
--- src/ChangeLog       7 Dec 2009 20:27:40 -0000       1.7912
+++ src/ChangeLog       9 Dec 2009 01:06:33 -0000       1.7913
@@ -1,3 +1,10 @@
+2009-12-09  Ken Brown  <address@hidden>  (tiny change)
+
+       * s/cygwin.h (G_SLICE_ALWAYS_MALLOC): New variable.
+
+       * emacs.c (main): Set the G_SLICE environment variable for Cygwin
+       GTK builds.
+
 2009-12-07  Andreas Schwab  <address@hidden>
 
        * unexelf.c (unexec): Don't search for .data twice.

Index: src/emacs.c
===================================================================
RCS file: /sources/emacs/emacs/src/emacs.c,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -b -r1.476 -r1.477
--- src/emacs.c 17 Nov 2009 08:21:34 -0000      1.476
+++ src/emacs.c 9 Dec 2009 01:06:36 -0000       1.477
@@ -809,6 +809,11 @@
   stack_base = &dummy;
 #endif
 
+#if defined (USE_GTK) && defined (G_SLICE_ALWAYS_MALLOC)
+  /* This is used by the Cygwin build.  */
+  setenv ("G_SLICE", "always-malloc", 1);
+#endif
+
   if (!initialized)
     {
       extern char my_endbss[];

Index: src/s/cygwin.h
===================================================================
RCS file: /sources/emacs/emacs/src/s/cygwin.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/s/cygwin.h      21 Nov 2009 04:50:36 -0000      1.22
+++ src/s/cygwin.h      9 Dec 2009 01:06:36 -0000       1.23
@@ -126,6 +126,12 @@
 /* Virtual addresses of pure and impure space can vary, as on Windows.  */
 #define VIRT_ADDR_VARIES
 
+/* Emacs supplies its own malloc, but glib (part of Gtk+) calls
+   memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
+   As malloc is not the Cygwin malloc, the Cygwin memalign always
+   returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
+#define G_SLICE_ALWAYS_MALLOC
+
 /* the end */
 
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b