aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/conf_post.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a0f46f028c8..d67b7513e37 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-03-28 Ken Brown <kbrown@cornell.edu>
2
3 * conf_post.h (SYSTEM_PURESIZE_EXTRA) [CYGWIN]: Set to 10000.
4 (Bug#17112)
5
12014-03-28 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62014-03-28 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * xterm.c (x_draw_image_glyph_string): Adjust image background 8 * xterm.c (x_draw_image_glyph_string): Adjust image background
diff --git a/src/conf_post.h b/src/conf_post.h
index 7419b53c5df..80d561090ed 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -161,6 +161,10 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
161#endif 161#endif
162#endif 162#endif
163 163
164#ifdef CYGWIN
165#define SYSTEM_PURESIZE_EXTRA 10000
166#endif
167
164#if defined HAVE_NTGUI && !defined DebPrint 168#if defined HAVE_NTGUI && !defined DebPrint
165# ifdef EMACSDEBUG 169# ifdef EMACSDEBUG
166extern void _DebPrint (const char *fmt, ...); 170extern void _DebPrint (const char *fmt, ...);